From 71174b6575881e140bc5c95e9ef5d4548af0ed34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jason=20K=C3=B6lker?= <jason@koelker.net>
Date: Wed, 15 Jun 2011 10:42:50 -0500
Subject: [PATCH] also allow for daemon in the config file so that we can test
 it easier

---
 bin/glance-scrubber | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/glance-scrubber b/bin/glance-scrubber
index 64264c1330..f2b3cad9d7 100755
--- a/bin/glance-scrubber
+++ b/bin/glance-scrubber
@@ -63,10 +63,11 @@ if __name__ == '__main__':
     create_options(oparser)
     (options, args) = config.parse_options(oparser)
 
-    daemon = options.get('daemon')
-
     try:
         conf, app = config.load_paste_app('glance-scrubber', options, args)
+        daemon = options.get('daemon') or \
+                 config.get_option(conf, 'daemon', type='bool',
+                                   default=False)
 
         if daemon:
             wakeup_time = int(conf.get('wakeup_time', 300))