Logging fixups

devstack/components/nova.py

@@ -374,7 +374,7 @@ class NovaInstaller(NovaMixin, comp.PythonInstallComponent):
             config = cfg.IgnoreMissingConfigParser()
             config.readfp(stream)
             config.set('logger_root', 'level', 'DEBUG')
-            config.set('logger_root', 'handlers', "stdout,")
+            config.set('logger_root', 'handlers', "stdout")
             contents = config.stringify(fn)
         return contents
 

devstack/distros/oneiric.py

@@ -52,26 +52,25 @@ class DBInstaller(db.DBInstaller):
 class RabbitPackager(apt.AptPackager):
 
     def _remove(self, pkg):
-        #https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/878597
-        #https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/878600
+        # See: https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/878597
+        # See: https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/878600
         name = pkg['name']
         LOG.debug("Handling special remove of %r" % (name))
         pkg_full = self._format_pkg_name(name, pkg.get("version"))
         cmd = apt.APT_REMOVE + [pkg_full]
         self._execute_apt(cmd)
-        #probably useful to do this
+        # Probably useful to do this (ie purge)
         time.sleep(1)
-        #purge
         cmd = apt.APT_PURGE + [pkg_full]
         self._execute_apt(cmd)
         return True
 
     def _install(self, pkg):
-        #https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/878597
-        #https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/878600
+        # See: https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/878597
+        # See: https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/878600
         name = pkg['name']
         LOG.debug("Handling special install of %r" % (name))
-        #this seems to be a temporary fix for that bug
+        # This seems to be a temporary fix for that bug...
         with tempfile.TemporaryFile() as f:
             pkg_full = self._format_pkg_name(name, pkg.get("version"))
             cmd = apt.APT_INSTALL + [pkg_full]

devstack/image/uploader.py

@@ -209,6 +209,7 @@ class Image(object):
             LOG.info('Adding kernel %s to glance.', colorizer.quote(kernel_image_name))
             params['NAME'] = kernel_image_name
             cmd = {'cmd': IMAGE_ADD}
+            LOG.info("Please wait...")
             with open(params['FILE_NAME'], 'r') as fh:
                 res = utils.execute_template(cmd,
                     params=params, stdin_fh=fh,
@@ -228,6 +229,7 @@ class Image(object):
             self._check_name(ram_image_name)
             LOG.info('Adding ramdisk %s to glance.', colorizer.quote(ram_image_name))
             cmd = {'cmd': IMAGE_ADD}
+            LOG.info("Please wait...")
             with open(params['FILE_NAME'], 'r') as fh:
                 res = utils.execute_template(cmd,
                     params=params, stdin_fh=fh,
@@ -251,6 +253,7 @@ class Image(object):
             add_cmd += ['--property', 'ramdisk_id=%INITRD_ID%']
             params['INITRD_ID'] = initrd_id
         cmd = {'cmd': add_cmd}
+        LOG.info("Please wait...")
         with open(params['FILE_NAME'], 'r') as fh:
             res = utils.execute_template(cmd,
                 params=params, stdin_fh=fh,

devstack/opts.py

@@ -18,13 +18,10 @@ from optparse import IndentedHelpFormatter
 from optparse import OptionParser, OptionGroup
 
 from devstack import actions
-from devstack import log as logging
 from devstack import version
 
 HELP_WIDTH = 80
 
-LOG = logging.getLogger(__name__)
-
 
 def _format_list(in_list):
     sorted_list = sorted(in_list)

devstack/runners/fork.py

@@ -28,7 +28,7 @@ from devstack import runner as base
 from devstack import shell as sh
 from devstack import trace as tr
 
-LOG = logging.getLogger("devstack.runners.fork")
+LOG = logging.getLogger(__name__)
 
 # Maximum for the number of available file descriptors (when not found)
 MAXFD = 2048

devstack/runners/screen.py

@@ -27,7 +27,7 @@ from devstack import shell as sh
 from devstack import trace as tr
 from devstack import utils
 
-LOG = logging.getLogger("devstack.runners.screen")
+LOG = logging.getLogger(__name__)
 
 # Trace constants
 SCREEN_TEMPL = "%s.screen"

devstack/runners/upstart.py

@@ -24,7 +24,7 @@ from devstack import shell as sh
 from devstack import trace as tr
 from devstack import utils
 
-LOG = logging.getLogger("devstack.runners.upstart")
+LOG = logging.getLogger(__name__)
 
 # Trace constants
 UPSTART_TEMPL = "%s.upstart"