From aa4433af4cc62365992c30cd4e27b4886c906ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20K=C3=B6lker?= Date: Mon, 13 Jun 2011 12:21:35 -0500 Subject: [PATCH] call it a Daemon, cuz it is --- bin/glance-scrubber | 2 +- glance/store/scrubber.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/glance-scrubber b/bin/glance-scrubber index d47db40932..31cb8f3f68 100755 --- a/bin/glance-scrubber +++ b/bin/glance-scrubber @@ -60,7 +60,7 @@ if __name__ == '__main__': conf, app = config.load_paste_app('glance-scrubber', options, args) wakeup_time = int(conf.get('wakeup_time', 300)) - server = scrubber.Server(wakeup_time) + server = scrubber.Daemon(wakeup_time) server.start(app) server.wait() except RuntimeError, e: diff --git a/glance/store/scrubber.py b/glance/store/scrubber.py index 3917c3f4dd..a41c152b11 100644 --- a/glance/store/scrubber.py +++ b/glance/store/scrubber.py @@ -29,9 +29,9 @@ from glance.registry.db import api as db_api logger = logging.getLogger('glance.store.scrubber') -class Server(object): +class Daemon(object): def __init__(self, wakeup_time=300, threads=1000): - logger.info("Starting Server: " + + logger.info("Starting Daemon: " + "wakeup_time=%s threads=%s" % (wakeup_time, threads)) self.wakeup_time = wakeup_time self.event = eventlet.event.Event() @@ -44,7 +44,7 @@ class Server(object): try: self.event.wait() except KeyboardInterrupt: - logger.info("Server Shutdown on KeyboardInterrupt") + logger.info("Daemon Shutdown on KeyboardInterrupt") def _run(self, application): logger.debug("Runing application")