diff --git a/workers/diffsworker.py b/workers/diffsworker.py
index f69ed9932..bdd9181a7 100644
--- a/workers/diffsworker.py
+++ b/workers/diffsworker.py
@@ -10,6 +10,13 @@ from data.queue import image_diff_queue
 from endpoints.registry import process_image_changes
 
 
+
+root_logger = logging.getLogger('')
+root_logger.setLevel(logging.DEBUG)
+
+FORMAT = '%(asctime)-15s - %(levelname)s - %(pathname)s - %(funcName)s - %(message)s'
+formatter = logging.Formatter(FORMAT)
+
 logger = logging.getLogger(__name__)
 
 
@@ -32,20 +39,8 @@ def process_work_items():
   logger.debug('No more work.')
 
 
-parser = argparse.ArgumentParser(description='Worker daemon to compute diffs')
-parser.add_argument('-D', action='store_true', default=False,
-                    help='Run the worker in daemon mode.')
-parser.add_argument('--log', default='diffsworker.log',
-                    help='Specify the log file for the worker as a daemon.')
-args = parser.parse_args()
-
-def start_worker(args):
-  FORMAT = '%(asctime)-15s - %(levelname)s - %(pathname)s - %(funcName)s - %(message)s'
-
-  if args.D:
-    logging.basicConfig(filename=args.log, format=FORMAT, level=logging.DEBUG)
-  else:
-    logging.basicConfig(format=FORMAT, level=logging.DEBUG)    
+def start_worker():
+  logger.debug("Scheduling worker.")
 
   sched = Scheduler()
   sched.start()
@@ -55,9 +50,29 @@ def start_worker(args):
   while True:
     time.sleep(60 * 60 * 24)  # sleep one day, basically forever
 
+
+parser = argparse.ArgumentParser(description='Worker daemon to compute diffs')
+parser.add_argument('-D', action='store_true', default=False,
+                    help='Run the worker in daemon mode.')
+parser.add_argument('--log', default='diffsworker.log',
+                    help='Specify the log file for the worker as a daemon.')
+args = parser.parse_args()
+
+
+# if not args.D:
+# else:
+#   logging.basicConfig(format=FORMAT, level=logging.DEBUG)    
+#   start_worker(args)
+
 if args.D:
-  with daemon.DaemonContext():
-    start_worker(args)
+  handler = logging.FileHandler(args.log)
+  handler.setFormatter(formatter)
+  root_logger.addHandler(handler)
+  with daemon.DaemonContext(files_preserve=[handler.stream]):
+    start_worker()
 
 else:
-  start_worker(args)
+  handler = logging.StreamHandler()
+  handler.setFormatter(formatter)
+  root_logger.addHandler(handler)
+  start_worker()
\ No newline at end of file