From 6146717784b6140e09f673927577335b27e2ed1d Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Mon, 21 Feb 2011 00:15:49 -0800
Subject: [PATCH] get rid of initialized flag

---
 nova/flags.py            |  4 ++--
 nova/log.py              | 16 ++++------------
 nova/test.py             |  3 +++
 nova/tests/fake_flags.py |  2 --
 nova/tests/test_log.py   |  6 ++----
 5 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/nova/flags.py b/nova/flags.py
index 2f3bdd675..72d123e21 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -29,7 +29,6 @@ import sys
 
 import gflags
 
-
 class FlagValues(gflags.FlagValues):
     """Extension of gflags.FlagValues that allows undefined and runtime flags.
 
@@ -93,7 +92,8 @@ class FlagValues(gflags.FlagValues):
         self.__dict__['__stored_argv'] = original_argv
         self.__dict__['__was_already_parsed'] = True
         self.ClearDirty()
-        FlagValues.initialized = True
+        from nova import log as logging
+        logging.reset()
         return args
 
     def Reset(self):
diff --git a/nova/log.py b/nova/log.py
index 57a550a0b..8d240782d 100644
--- a/nova/log.py
+++ b/nova/log.py
@@ -143,9 +143,7 @@ class NovaLogger(logging.Logger):
     """
     def __init__(self, name, level=NOTSET):
         logging.Logger.__init__(self, name, level)
-        self.initialized = False
-        if flags.FlagValues.initialized:
-            self.setup_from_flags()
+        self.setup_from_flags()
 
     @staticmethod
     def _get_level_from_flags(name):
@@ -166,15 +164,6 @@ class NovaLogger(logging.Logger):
         """Setup logger from flags"""
         level_name = self._get_level_from_flags(self.name)
         self.setLevel(globals()[level_name])
-        self.initialized = True
-        if not logging.root.initialized:
-            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()
-        return logging.Logger.isEnabledFor(self, level)
 
     def _log(self, level, msg, args, exc_info=None, extra=None, context=None):
         """Extract context from any log call"""
@@ -304,6 +293,9 @@ if not isinstance(logging.root, NovaRootLogger):
     NovaLogger.manager.root = logging.root
 root = logging.root
 
+def reset():
+    root.setup_from_flags()
+
 
 def audit(msg, *args, **kwargs):
     """Shortcut for logging to root log with sevrity 'AUDIT'."""
diff --git a/nova/test.py b/nova/test.py
index a12cf9d32..8022396cd 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -32,9 +32,12 @@ from nova import context
 from nova import db
 from nova import fakerabbit
 from nova import flags
+from nova import log as logging
 from nova import rpc
 from nova.network import manager as network_manager
+
 from nova.tests import fake_flags
+logging.reset()
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index 0a1011d86..59839b090 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -42,5 +42,3 @@ FLAGS.verbose = True
 FLAGS.sql_connection = 'sqlite:///nova.sqlite'
 FLAGS.use_ipv6 = True
 FLAGS.logfile = 'run_tests.err'
-# NOTE(vish): pretend like we've loaded flags from command line
-flags.FlagValues.initialized = True
diff --git a/nova/tests/test_log.py b/nova/tests/test_log.py
index ada8d0a56..122351ff6 100644
--- a/nova/tests/test_log.py
+++ b/nova/tests/test_log.py
@@ -46,14 +46,12 @@ class RootLoggerTestCase(test.TestCase):
 
     def test_will_be_verbose_if_verbose_flag_set(self):
         self.flags(verbose=True)
-        self.log.initialized = False
-        log.audit("foo", context=_fake_context())
+        log.reset()
         self.assertEqual(log.DEBUG, self.log.level)
 
     def test_will_not_be_verbose_if_verbose_flag_not_set(self):
         self.flags(verbose=False)
-        self.log.initialized = False
-        log.audit("foo", context=_fake_context())
+        log.reset()
         self.assertEqual(log.INFO, self.log.level)