diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-19 04:41:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-19 04:41:21 +0000 |
| commit | ff4c17c40b6ed555c8dba771de590d6cceb51268 (patch) | |
| tree | c2a30b55114fc26d32aada6ac8b115815528d9b9 | |
| parent | 8aca5eb5868b5ead362777abb093f11c6d8b1817 (diff) | |
| parent | 27f4d87e9ca31e0b38d3a38a03c63db685af5085 (diff) | |
| download | oslo-ff4c17c40b6ed555c8dba771de590d6cceb51268.tar.gz oslo-ff4c17c40b6ed555c8dba771de590d6cceb51268.tar.xz oslo-ff4c17c40b6ed555c8dba771de590d6cceb51268.zip | |
Merge "Use the ThreadGroup for the Launcher"
| -rw-r--r-- | openstack/common/service.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/openstack/common/service.py b/openstack/common/service.py index d9634dc..0c355f7 100644 --- a/openstack/common/service.py +++ b/openstack/common/service.py @@ -27,7 +27,6 @@ import sys import time import eventlet -import greenlet import logging as std_logging from openstack.common import cfg @@ -54,7 +53,7 @@ class Launcher(object): :returns: None """ - self._services = [] + self._services = threadgroup.ThreadGroup('launcher') eventlet_backdoor.initialize_if_enabled() @staticmethod @@ -75,8 +74,7 @@ class Launcher(object): :returns: None """ - gt = eventlet.spawn(self.run_service, service) - self._services.append(gt) + self._services.add_thread(self.run_service, service) def stop(self): """Stop all services which are currently running. @@ -84,8 +82,7 @@ class Launcher(object): :returns: None """ - for service in self._services: - service.kill() + self._services.stop() def wait(self): """Waits until all services have been stopped, and then returns. @@ -93,11 +90,7 @@ class Launcher(object): :returns: None """ - for service in self._services: - try: - service.wait() - except greenlet.GreenletExit: - pass + self._services.wait() class SignalExit(SystemExit): |