From 2337fab0979b72bbc7e7730e94518a0e835a2751 Mon Sep 17 00:00:00 2001
From: Andy Smith <code@term.ie>
Date: Mon, 25 Oct 2010 03:45:19 +0900
Subject: part way through porting the codebase off of twisted

this provides a very basic eventlet-based service replacement for the
twistd-based services, a replacement for task.LoopingCall

also adds nova-combined with the goal of running a single service when
doing local testing and dev
---
 nova/manager.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nova/manager.py')

diff --git a/nova/manager.py b/nova/manager.py
index 4244b2db4..994d6e7af 100644
--- a/nova/manager.py
+++ b/nova/manager.py
@@ -39,7 +39,6 @@ class Manager(object):
             db_driver = FLAGS.db_driver
         self.db = utils.import_object(db_driver)  # pylint: disable-msg=C0103
 
-    @defer.inlineCallbacks
     def periodic_tasks(self, context=None):
         """Tasks to be run at a periodic interval"""
         yield
-- 
cgit 


From 3c85f1b7ed593a2d4d126a34241f217da5cf7ce6 Mon Sep 17 00:00:00 2001
From: Andy Smith <code@term.ie>
Date: Wed, 8 Dec 2010 17:18:27 -0800
Subject: intermediate commit to checkpoint progress

all relevant tests are passing except volume, next step is volume manager fixery
---
 nova/manager.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'nova/manager.py')

diff --git a/nova/manager.py b/nova/manager.py
index 5e067bd08..a343d7fc6 100644
--- a/nova/manager.py
+++ b/nova/manager.py
@@ -55,7 +55,6 @@ from nova import utils
 from nova import flags
 from nova.db import base
 
-from twisted.internet import defer
 
 FLAGS = flags.FLAGS
 
@@ -69,7 +68,7 @@ class Manager(base.Base):
 
     def periodic_tasks(self, context=None):
         """Tasks to be run at a periodic interval"""
-        yield
+        return
 
     def init_host(self):
         """Do any initialization that needs to be run if this is a standalone
-- 
cgit 


From a2a8406b5d793545c8ecb359e18b80bba618c509 Mon Sep 17 00:00:00 2001
From: termie <code@term.ie>
Date: Tue, 14 Dec 2010 16:05:39 -0800
Subject: updates per review

---
 nova/manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/manager.py')

diff --git a/nova/manager.py b/nova/manager.py
index a343d7fc6..3d38504bd 100644
--- a/nova/manager.py
+++ b/nova/manager.py
@@ -68,7 +68,7 @@ class Manager(base.Base):
 
     def periodic_tasks(self, context=None):
         """Tasks to be run at a periodic interval"""
-        return
+        pass
 
     def init_host(self):
         """Do any initialization that needs to be run if this is a standalone
-- 
cgit