remove extra references to logging.basicConfig

8 files changed, 15 insertions, 16 deletions

diff --git a/bin/nova-api b/bin/nova-api
index 11176a021..8b3674880 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -39,7 +39,6 @@ from nova import log as logging
 from nova import version
 from nova import wsgi
 
-logging.basicConfig()
 LOG = logging.getLogger('nova.api')
 LOG.setLevel(logging.DEBUG)
 
@@ -71,7 +70,8 @@ def run_app(paste_config_file):
         return
 
     # NOTE(todd): redo logging config, verbose could be set in paste config
-    logging.basicConfig()
+    logging.root.setup_from_flags()
+
     server = wsgi.Server()
     for app in apps:
         server.start(*app)
diff --git a/bin/nova-combined b/bin/nova-combined
index 913c866bf..5911d9016 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -49,7 +49,6 @@ FLAGS = flags.FLAGS
 if __name__ == '__main__':
     utils.default_flagfile()
     FLAGS(sys.argv)
-    logging.basicConfig()
 
     compute = service.Service.create(binary='nova-compute')
     network = service.Service.create(binary='nova-network')
@@ -73,7 +72,6 @@ if __name__ == '__main__':
         apps.append((app, getattr(FLAGS, "%s_port" % api),
                      getattr(FLAGS, "%s_host" % api)))
     if len(apps) > 0:
-        logging.basicConfig()
         server = wsgi.Server()
         for app in apps:
             server.start(*app)
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index d38ba2543..e0e6af826 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -102,7 +102,6 @@ def main():
     flagfile = os.environ.get('FLAGFILE', FLAGS.dhcpbridge_flagfile)
     utils.default_flagfile(flagfile)
     argv = FLAGS(sys.argv)
-    logging.basicConfig()
     interface = os.environ.get('DNSMASQ_INTERFACE', 'br0')
     if int(os.environ.get('TESTING', '0')):
         FLAGS.fake_rabbit = True
diff --git a/bin/nova-manage b/bin/nova-manage
index 6d67252b8..878a9afaa 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -77,7 +77,6 @@ from nova import crypto
 from nova import db
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova import quota
 from nova import rpc
 from nova import utils
@@ -87,7 +86,6 @@ from nova.cloudpipe import pipelib
 from nova.db import migration
 
 
-logging.basicConfig()
 FLAGS = flags.FLAGS
 flags.DECLARE('fixed_range', 'nova.network.manager')
 flags.DECLARE('num_networks', 'nova.network.manager')
diff --git a/nova/log.py b/nova/log.py
index 12b695a41..0a863c921 100644
--- a/nova/log.py
+++ b/nova/log.py
@@ -160,20 +160,20 @@ class NovaLogger(logging.Logger):
         logging.Logger.__init__(self, name, level)
         self.initialized = False
         if flags.FlagValues.initialized:
-            self._setup_from_flags()
+            self.setup_from_flags()
 
-    def _setup_from_flags(self):
+    def setup_from_flags(self):
         """Setup logger from flags"""
         level_name = _get_level_from_flags(self.name)
         self.setLevel(globals()[level_name])
         self.initialized = True
         if not logging.root.initialized:
-            logging.root._setup_from_flags()
+            logging.root.setup_from_flags()
 
     def isEnabledFor(self, level):
         """Reset level after flags have been loaded"""
         if not self.initialized and flags.FlagValues.initialized:
-            self._setup_from_flags()
+            self.setup_from_flags()
         return logging.Logger.isEnabledFor(self, level)
 
     def _log(self, level, msg, args, exc_info=None, extra=None, context=None):
@@ -276,18 +276,24 @@ class NovaRootLogger(NovaLogger):
         NovaLogger.__init__(self, name, level)
         self.addHandler(_streamlog)
 
-    def _setup_from_flags(self):
+    def setup_from_flags(self):
         """Setup logger from flags"""
         global _filelog
         if FLAGS.use_syslog:
             self.addHandler(_syslog)
+        else:
+            self.removeHandler(_syslog)
         logpath = _get_log_file_path()
         if logpath:
             if not _filelog:
                 _filelog = WatchedFileHandler(logpath)
             self.addHandler(_filelog)
             self.removeHandler(_streamlog)
-        return NovaLogger._setup_from_flags(self)
+        else:
+            self.removeHandler(_filelog)
+            self.addHandler(_streamlog)
+
+        return NovaLogger.setup_from_flags(self)
 
 
 if not isinstance(logging.root, NovaRootLogger):
@@ -296,6 +302,7 @@ if not isinstance(logging.root, NovaRootLogger):
     logging.root = NovaRootLogger("nova")
     NovaLogger.root = logging.root
     NovaLogger.manager.root = logging.root
+root=logging.root
 
 
 def audit(msg, *args, **kwargs):
diff --git a/nova/service.py b/nova/service.py
index 59648adf2..02e86f6b3 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -215,7 +215,6 @@ class Service(object):
 
 def serve(*services):
     FLAGS(sys.argv)
-    logging.basicConfig()
 
     if not services:
         services = [Service.create()]
diff --git a/nova/twistd.py b/nova/twistd.py
index 60ff7879a..0e4db022c 100644
--- a/nova/twistd.py
+++ b/nova/twistd.py
@@ -258,7 +258,6 @@ def serve(filename):
         print 'usage: %s [options] [start|stop|restart]' % argv[0]
         sys.exit(1)
 
-    logging.basicConfig()
     logging.debug(_("Full set of FLAGS:"))
     for flag in FLAGS:
         logging.debug("%s : %s" % (flag, FLAGS.get(flag, None)))
diff --git a/nova/wsgi.py b/nova/wsgi.py
index e01cc1e1e..280baa80b 100644
--- a/nova/wsgi.py
+++ b/nova/wsgi.py
@@ -59,7 +59,6 @@ class Server(object):
     """Server class to manage multiple WSGI sockets and applications."""
 
     def __init__(self, threads=1000):
-        logging.basicConfig()
         self.pool = eventlet.GreenPool(threads)
 
     def start(self, application, port, host='0.0.0.0', backlog=128):