openstack/glance
Code Issues Proposed changes

change order of paramaters and make event optional

Browse Source
This commit is contained in:
Jason Kölker 2011-06-15 10:33:09 -05:00
parent d36ff21023
commit e8ac790b1f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glance/store/scrubber.py
View File

@ -48,7 +48,7 @@ class Daemon(object):
def _run(self, application): def _run(self, application):
logger.debug("Runing application") logger.debug("Runing application")
self.pool.spawn_n(application.run, self.event, self.pool) self.pool.spawn_n(application.run, self.pool, self.event)
eventlet.spawn_after(self.wakeup_time, self._run, application) eventlet.spawn_after(self.wakeup_time, self._run, application)
logger.debug("Next run scheduled in %s seconds" % self.wakeup_time) logger.debug("Next run scheduled in %s seconds" % self.wakeup_time)
@ -64,7 +64,7 @@ class Scrubber(object):
self.scrub_time = datetime.timedelta(seconds=scrub_time) self.scrub_time = datetime.timedelta(seconds=scrub_time)
db_api.configure_db(options) db_api.configure_db(options)
def run(self, event, pool): def run(self, pool, event=None):
delete_time = datetime.datetime.utcnow() - self.scrub_time delete_time = datetime.datetime.utcnow() - self.scrub_time
logger.info("Getting images deleted before %s" % delete_time) logger.info("Getting images deleted before %s" % delete_time)
pending = db_api.image_get_all_pending_delete(None, delete_time) pending = db_api.image_get_all_pending_delete(None, delete_time)