diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-02-05 11:47:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-02-05 11:47:52 +0000 |
| commit | 806f551d1fba7c6ed001d5c9f99101f0be6550ef (patch) | |
| tree | 28ed8b66603307f9d56ec21f2d1a81184d98aa2b | |
| parent | 4665d685f5866d0e7f67bda7ebaa53476b4fc4d5 (diff) | |
| parent | 2fc9b4f5ea9cb6e01f7116a099e63b197181f71a (diff) | |
| download | python-heatclient-806f551d1fba7c6ed001d5c9f99101f0be6550ef.tar.gz | |
Merge "Configure logging regardless of debug flag"
| -rw-r--r-- | heatclient/shell.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/heatclient/shell.py b/heatclient/shell.py index 9d136a6..c6fa947 100644 --- a/heatclient/shell.py +++ b/heatclient/shell.py @@ -271,11 +271,11 @@ class HeatShell(object): service_type=kwargs.get('service_type') or 'orchestration', endpoint_type=kwargs.get('endpoint_type') or 'publicURL') - def _setup_debugging(self, debug): - if debug: - logging.basicConfig( - format="%(levelname)s (%(module)s:%(lineno)d) %(message)s", - level=logging.DEBUG) + def _setup_logging(self, debug): + log_lvl = logging.DEBUG if debug else logging.ERROR + logging.basicConfig( + format="%(levelname)s (%(module)s:%(lineno)d) %(message)s", + level=log_lvl) def _setup_verbose(self, verbose): if verbose: @@ -285,7 +285,7 @@ class HeatShell(object): # Parse args once to find version parser = self.get_base_parser() (options, args) = parser.parse_known_args(argv) - self._setup_debugging(options.debug) + self._setup_logging(options.debug) self._setup_verbose(options.verbose) # build available subcommands based on version |