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

[Jay Pipes]

Use logging module, not echo, for logging SQLAlchemy. Fixes bug 746435.

[Rick Harris (rconradharris)]

lgtm

review: Approve

[Andrey Brindeyev (abrindeyev)]

lgtm

review: Approve

[Eldar Nugaev (reldan)]

+ if verbose:
28 + logger.setLevel(logging.INFO)
29 + elif debug:
30 + logger.setLevel(logging.DEBUG)

Should be replaced by

if debug:
    logger.setLevel(logging.DEBUG)
elif verbose:
    logger.setLevel(logging.INFO)

for case verbose=True, Debug=True

review: Needs Fixing

[Jay Pipes (jaypipes)]

Elgar, that would mean the --debug would be ignored. Is that what you really want? I was thinking taking the more verbose setting (--debug) over the less verbose one in the case that both were specified is the better choice?

[Jay Pipes (jaypipes)]

hold on... I'm not sure there would be any difference in either case...

[Eldar Nugaev (reldan)]

INFO level doesn't include DEBUG messages, but DEBUG level includes DEBUG messages.
There is my examples

example1:

verbose = True
debug = True
logger = logging.getLogger('test')
if debug:
    logger.setLevel(logging.DEBUG)
elif verbose:
    logger.setLevel(logging.INFO)

logger.debug("DEBUG")
logger.info("INFO")

output:
DEBUG:test:DEBUG
INFO:test:INFO

example2:

verbose = True
debug = True
logger = logging.getLogger('test')
if verbose:
    logger.setLevel(logging.INFO)
elif debug:
    logger.setLevel(logging.DEBUG)

logger.debug("DEBUG")
logger.info("INFO")

output:
INFO:test:INFO

[Eldar Nugaev (reldan)]

I make typo "debug level includes info" instead of "DEBUG level includes DEBUG messages."
Sorry :)

[Jay Pipes (jaypipes)]

Example 1 is what we wanted.

[Jay Pipes (jaypipes)]

I'll post another commit. thx for pointing this out, Elgar.

[Eldar Nugaev (reldan)]

Thank you, Jay )

[Eldar Nugaev (reldan)]

review: Approve

=== modified file 'glance/registry/db/api.py'
--- glance/registry/db/api.py	2011-04-04 17:58:38 +0000
+++ glance/registry/db/api.py	2011-04-06 15:19:31 +0000
@@ -69,10 +69,10 @@
         _ENGINE = create_engine(options['sql_connection'],
                                 pool_recycle=timeout)
         logger = logging.getLogger('sqlalchemy.engine')
-        if verbose:
+        if debug:
+            logger.setLevel(logging.DEBUG)
+        elif verbose:
             logger.setLevel(logging.INFO)
-        elif debug:
-            logger.setLevel(logging.DEBUG)
         register_models()