Moves logging setup to utils

coriolis/cmd/api.py

@@ -4,17 +4,15 @@ eventlet.monkey_patch()
 import sys
 
 from coriolis import service
+from coriolis import utils
 
 from oslo_config import cfg
-from oslo_log import log as logging
 
 CONF = cfg.CONF
 
 
 def main():
-    logging.register_options(CONF)
-    logging.setup(CONF, 'coriolis')
-
+    utils.setup_logging()
     CONF(sys.argv[1:], project='coriolis',
          version="1.0.0")
 

coriolis/cmd/conductor.py

@@ -3,19 +3,17 @@ eventlet.monkey_patch()
 
 import sys
 
+from oslo_config import cfg
+
 from coriolis.conductor.rpc import server as rpc_server
 from coriolis import service
-
-from oslo_config import cfg
-from oslo_log import log as logging
+from coriolis import utils
 
 CONF = cfg.CONF
 
 
 def main():
-    logging.register_options(CONF)
-    logging.setup(CONF, 'coriolis')
-
+    utils.setup_logging()
     CONF(sys.argv[1:], project='coriolis',
          version="1.0.0")
 

coriolis/cmd/db_sync.py

@@ -1,17 +1,15 @@
 import sys
 
 from oslo_config import cfg
-from oslo_log import log as logging
 
 from coriolis.db import api as db_api
+from coriolis import utils
 
 CONF = cfg.CONF
 
 
 def main():
-    logging.register_options(CONF)
-    logging.setup(CONF, 'coriolis')
-
+    utils.setup_logging()
     CONF(sys.argv[1:], project='coriolis',
          version="1.0.0")
 

coriolis/cmd/worker.py

@@ -3,19 +3,17 @@ eventlet.monkey_patch()
 
 import sys
 
+from oslo_config import cfg
+
 from coriolis.worker.rpc import server as rpc_server
 from coriolis import service
-
-from oslo_config import cfg
-from oslo_log import log as logging
+from coriolis import utils
 
 CONF = cfg.CONF
 
 
 def main():
-    logging.register_options(CONF)
-    logging.setup(CONF, 'coriolis')
-
+    utils.setup_logging()
     CONF(sys.argv[1:], project='coriolis',
          version="1.0.0")
 

coriolis/utils.py

@@ -23,6 +23,11 @@ CONF.register_opts(opts)
 LOG = logging.getLogger(__name__)
 
 
+def setup_logging():
+    logging.register_options(CONF)
+    logging.setup(CONF, 'coriolis')
+
+
 def retry_on_error(max_attempts=5, sleep_seconds=0):
     def _retry_on_error(func):
         @functools.wraps(func)

coriolis/worker/rpc/server.py

@@ -129,8 +129,7 @@ def _export_instance(export_provider, connection_info,
                      instance, export_path, mp_q):
     try:
         # Setting up logging, needed since this is a new process
-        logging.register_options(CONF)
-        logging.setup(CONF, 'coriolis')
+        utils.setup_logging()
 
         vm_info = export_provider.export_instance(
             connection_info, instance, export_path)
@@ -144,8 +143,7 @@ def _import_instance(import_provider, connection_info,
                      target_environment, instance, export_info, mp_q):
     try:
         # Setting up logging, needed since this is a new process
-        logging.register_options(CONF)
-        logging.setup(CONF, 'coriolis')
+        utils.setup_logging()
 
         import_provider.import_instance(
             connection_info, target_environment, instance, export_info)