Merge lp:~jaypipes/glance/bug759012 into lp:~glance-coresec/glance/cactus-trunk

[Jay Pipes]

Ensures that configuration values for debug and verbose are used if command-line options are not set.

[Thierry Carrez (ttx)]

Hrm...

conf['verbose'] = debug
conf['debug'] = verbose

You surely meant the other way around ?

review: Needs Fixing

[Jay Pipes (jaypipes)]

doh. doh again!

[Jay Pipes (jaypipes)]

ok, fixed.

[Thierry Carrez (ttx)]

lgtm

review: Approve

[Rick Harris (rconradharris)]

Received a test failure: http://paste.openstack.org/show/1180/

Otherwise, code looks good.

review: Needs Fixing

[Rick Harris (rconradharris)]

Looks like I'm getting this test failure in trunk, so it's unrelated to this particular patch. Marking as approved. I'll swing around and debug this issue separately.

review: Approve

[Jay Pipes (jaypipes)]

On Wed, Apr 13, 2011 at 12:27 PM, Rick Harris <email address hidden> wrote:
> Review: Needs Fixing
> Received a test failure: http://paste.openstack.org/show/1180/
>
> Otherwise, code looks good.

Actually, it's unrelated to this patch.
https://bugs.launchpad.net/glance/+bug/759018

-jay

=== modified file 'glance/common/config.py'
--- glance/common/config.py	2011-04-04 17:00:26 +0000
+++ glance/common/config.py	2011-04-13 12:57:33 +0000
@@ -133,8 +133,10 @@
             raise RuntimeError("Unable to locate specified logging "
                                "config file: %s" % options['log_config'])
 
-    debug = options.get('debug', False)
-    verbose = options.get('verbose', False)
+    # If either the CLI option or the conf value
+    # is True, we set to True
+    debug = options.get('debug') or conf.get('debug', False)
+    verbose = options.get('verbose') or conf.get('verbose', False)
     root_logger = logging.root
     if debug:
         root_logger.setLevel(logging.DEBUG)
@@ -276,11 +278,13 @@
 
         # We only update the conf dict for the verbose and debug
         # flags. Everything else must be set up in the conf file...
-        conf['verbose'] = options['verbose']
-        conf['debug'] = options['debug']
+        debug = options.get('debug') or conf.get('debug', False)
+        verbose = options.get('verbose') or conf.get('verbose', False)
+        conf['debug'] = debug
+        conf['verbose'] = verbose
 
         # Log the options used when starting if we're in debug mode...
-        if conf['debug']:
+        if debug:
             logger = logging.getLogger(app_name)
             logger.debug("*" * 80)
             logger.debug("Configuration options gathered from config file:")