summaryrefslogtreecommitdiff
path: root/ceilometer/service.py
diff options
context:
space:
mode:
authorMehdi Abaakouk <mehdi.abaakouk@enovance.com>2014-03-11 10:36:01 +0100
committerMehdi Abaakouk <mehdi.abaakouk@enovance.com>2014-03-18 08:57:31 +0100
commit78331c079bd69b51fb3dddd690c280434f533bd7 (patch)
tree9f9e8697ac6a51e32ceb4a1cc56c0e5114d307b7 /ceilometer/service.py
parent79bb83f340c65cbb71bc52d10e76676c00d414ac (diff)
downloadceilometer-78331c079bd69b51fb3dddd690c280434f533bd7.tar.gz
Eventlet monkeypatch must be done before anything
This patch ensure eventlet have patched modules before they are loaded and used. Closes-bug: #1288878 Change-Id: Ieb1fc252bde94a19fdba14a87c9f97848208bdc5
Diffstat (limited to 'ceilometer/service.py')
-rw-r--r--ceilometer/service.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/ceilometer/service.py b/ceilometer/service.py
index d3e06f7f..f69ee3db 100644
--- a/ceilometer/service.py
+++ b/ceilometer/service.py
@@ -21,7 +21,6 @@ import os
import socket
import sys
-import eventlet
from oslo.config import cfg
from stevedore import named
@@ -108,10 +107,6 @@ class DispatchedService(object):
def prepare_service(argv=None):
- # NOTE(jd) We need to monkey patch the socket and select module for,
- # at least, oslo.rpc, otherwise everything's blocked on its first read()
- # or select()
- eventlet.monkey_patch(socket=True, select=True)
gettextutils.install('ceilometer', lazy=True)
rpc.set_defaults(control_exchange='ceilometer')
cfg.set_defaults(log.log_opts,