From f5665b005c89b2a34fda5344d9df76792a45d4d4 Mon Sep 17 00:00:00 2001 From: Tim Simpson Date: Wed, 7 Mar 2012 16:33:58 -0600 Subject: [PATCH] Added gitignore and re-fixed pep8 violations. --- .gitignore | 2 ++ bin/reddwarf-guestagent | 4 ++-- bin/reddwarf-taskmanager | 3 ++- reddwarf/common/service.py | 5 +++-- reddwarf/common/utils.py | 1 + reddwarf/database/service.py | 3 ++- reddwarf/guestagent/manager.py | 5 ++--- reddwarf/guestagent/service.py | 2 +- reddwarf/taskmanager/manager.py | 5 ++--- 9 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 60600168a3..812791c1bb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ reddwarf_test.sqlite .venv run_tests.log guest-agent-files.txt +reddwarf.egg* +reddwarf/vcsversion.py diff --git a/bin/reddwarf-guestagent b/bin/reddwarf-guestagent index 08d7849078..d3ea021656 100755 --- a/bin/reddwarf-guestagent +++ b/bin/reddwarf-guestagent @@ -46,7 +46,8 @@ if __name__ == '__main__': (options, args) = config.parse_options(parser) try: - conf, app = config.Config.load_paste_app('reddwarf-guestagent', options, args) + conf, app = config.Config.load_paste_app('reddwarf-guestagent', + options, args) server = service.Service.create(binary='reddwarf-guestagent') service.serve(server) service.wait() @@ -54,4 +55,3 @@ if __name__ == '__main__': import traceback print traceback.format_exc() sys.exit("ERROR: %s" % error) - diff --git a/bin/reddwarf-taskmanager b/bin/reddwarf-taskmanager index efe58a824c..5eb5dda035 100755 --- a/bin/reddwarf-taskmanager +++ b/bin/reddwarf-taskmanager @@ -46,7 +46,8 @@ if __name__ == '__main__': (options, args) = config.parse_options(parser) try: - conf, app = config.Config.load_paste_app('reddwarf-taskmanager', options, args) + conf, app = config.Config.load_paste_app('reddwarf-taskmanager', + options, args) server = service.Service.create(binary='reddwarf-taskmanager') service.serve(server) service.wait() diff --git a/reddwarf/common/service.py b/reddwarf/common/service.py index 9c4d6061d0..c238b50686 100644 --- a/reddwarf/common/service.py +++ b/reddwarf/common/service.py @@ -31,6 +31,7 @@ from reddwarf import version LOG = logging.getLogger(__name__) + class Launcher(object): """Launch one or more services and wait for them to complete.""" @@ -65,7 +66,6 @@ class Launcher(object): pass - class Service(object): """Generic code to start services and get them listening on rpc""" @@ -95,7 +95,6 @@ class Service(object): manager = self.__dict__.get('manager', None) return getattr(manager, key) - def start(self): vcs_string = version.version_string_with_vcs() LOG.info(_('Starting %(topic)s node (version %(vcs_string)s)'), @@ -165,6 +164,7 @@ class Service(object): _launcher = None + def serve(*servers): global _launcher if not _launcher: @@ -172,6 +172,7 @@ def serve(*servers): for server in servers: _launcher.launch_server(server) + def wait(): try: _launcher.wait() diff --git a/reddwarf/common/utils.py b/reddwarf/common/utils.py index d6cbe65996..b3412d1864 100644 --- a/reddwarf/common/utils.py +++ b/reddwarf/common/utils.py @@ -119,6 +119,7 @@ class MethodInspector(object): args_str = ' '.join(required + optionals) return "%s %s" % (self._func.__name__, args_str) + class LoopingCallDone(Exception): """Exception to break out and stop a LoopingCall. diff --git a/reddwarf/database/service.py b/reddwarf/database/service.py index f62b12e82a..2c6266bec7 100644 --- a/reddwarf/database/service.py +++ b/reddwarf/database/service.py @@ -58,7 +58,8 @@ class InstanceController(BaseController): def index(self, req, tenant_id): """Return all instances.""" servers = models.Instances(req.headers["X-Auth-Token"]).data() - #TODO(hub-cap): Remove this, this is only for testing communication between services + #TODO(hub-cap): Remove this, this is only for testing communication + # between services rpc.cast(context.ReddwarfContext(), "taskmanager.None", {"method": "test_method", "BARRRR": "ARGGGGG"}) diff --git a/reddwarf/guestagent/manager.py b/reddwarf/guestagent/manager.py index e9f7e6797d..f7efc447a0 100644 --- a/reddwarf/guestagent/manager.py +++ b/reddwarf/guestagent/manager.py @@ -19,16 +19,15 @@ import logging LOG = logging.getLogger(__name__) + class GuestAgent(object): """Task manager impl""" def __init__(self, *args, **kwargs): - LOG.info("GuestAgent init %s %s"% (args, kwargs)) + LOG.info("GuestAgent init %s %s" % (args, kwargs)) def periodic_tasks(self, raise_on_error=False): LOG.info("Launching a periodic task") def test_method(self, context): LOG.info("test_method called with context %s" % context) - - diff --git a/reddwarf/guestagent/service.py b/reddwarf/guestagent/service.py index 618cfd33b0..93583fc39d 100644 --- a/reddwarf/guestagent/service.py +++ b/reddwarf/guestagent/service.py @@ -29,6 +29,7 @@ class Controller(wsgi.Controller): """Base controller class.""" pass + class API(wsgi.Router): """API""" def __init__(self): @@ -44,4 +45,3 @@ class API(wsgi.Router): def app_factory(global_conf, **local_conf): return API() - diff --git a/reddwarf/taskmanager/manager.py b/reddwarf/taskmanager/manager.py index 8d00853a9e..70c8450536 100644 --- a/reddwarf/taskmanager/manager.py +++ b/reddwarf/taskmanager/manager.py @@ -19,16 +19,15 @@ import logging LOG = logging.getLogger(__name__) + class TaskManager(object): """Task manager impl""" def __init__(self, *args, **kwargs): - LOG.info("TaskManager init %s %s"% (args, kwargs)) + LOG.info("TaskManager init %s %s" % (args, kwargs)) def periodic_tasks(self, raise_on_error=False): LOG.info("Launching a periodic task") def test_method(self, context): LOG.info("test_method called with context %s" % context) - -