summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Simpson <tim.simpson@rackspace.com>2012-03-07 16:33:58 -0600
committerTim Simpson <tim.simpson@rackspace.com>2012-03-07 16:33:58 -0600
commitf5665b005c89b2a34fda5344d9df76792a45d4d4 (patch)
tree0ead22c3b475e83848f546cf1653fe64e48f7ec1
parent20c8c3e1054ba364e4a2ace8e49a5e976d4faf2e (diff)
downloadtrove-f5665b005c89b2a34fda5344d9df76792a45d4d4.tar.gz
Added gitignore and re-fixed pep8 violations.
-rw-r--r--.gitignore2
-rwxr-xr-xbin/reddwarf-guestagent4
-rwxr-xr-xbin/reddwarf-taskmanager3
-rw-r--r--reddwarf/common/service.py5
-rw-r--r--reddwarf/common/utils.py1
-rw-r--r--reddwarf/database/service.py3
-rw-r--r--reddwarf/guestagent/manager.py5
-rw-r--r--reddwarf/guestagent/service.py2
-rw-r--r--reddwarf/taskmanager/manager.py5
9 files changed, 17 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index 60600168..812791c1 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 08d78490..d3ea0216 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 efe58a82..5eb5dda0 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 9c4d6061..c238b506 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 d6cbe659..b3412d18 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 f62b12e8..2c6266be 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 e9f7e679..f7efc447 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 618cfd33..93583fc3 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 8d00853a..70c84505 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)
-
-