From c69987661728528655e06d12a8ab76528590192c Mon Sep 17 00:00:00 2001 From: Aanand Prasad Date: Thu, 20 Aug 2015 16:09:28 +0100 Subject: [PATCH] Set log level to DEBUG when `--verbose` is passed Signed-off-by: Aanand Prasad --- compose/cli/main.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/compose/cli/main.py b/compose/cli/main.py index 6c2a8edb6..cb38f54c2 100644 --- a/compose/cli/main.py +++ b/compose/cli/main.py @@ -25,6 +25,7 @@ from .log_printer import LogPrinter from .utils import yesno, get_version_info log = logging.getLogger(__name__) +console_handler = logging.StreamHandler(sys.stderr) INSECURE_SSL_WARNING = """ Warning: --allow-insecure-ssl is deprecated and has no effect. @@ -63,9 +64,6 @@ def main(): def setup_logging(): - console_handler = logging.StreamHandler(sys.stderr) - console_handler.setFormatter(logging.Formatter()) - console_handler.setLevel(logging.INFO) root_logger = logging.getLogger() root_logger.addHandler(console_handler) root_logger.setLevel(logging.DEBUG) @@ -118,6 +116,16 @@ class TopLevelCommand(Command): options['version'] = get_version_info('compose') return options + def perform_command(self, options, *args, **kwargs): + if options.get('--verbose'): + console_handler.setFormatter(logging.Formatter('%(name)s.%(funcName)s: %(message)s')) + console_handler.setLevel(logging.DEBUG) + else: + console_handler.setFormatter(logging.Formatter()) + console_handler.setLevel(logging.INFO) + + return super(TopLevelCommand, self).perform_command(options, *args, **kwargs) + def build(self, project, options): """ Build or rebuild services.