openstack/python-ceilometerclient
Code Issues Proposed changes

Merge "Ensure basic logging config is applied"

Browse Source
This commit is contained in:
Jenkins
2013-11-22 01:18:23 +00:00
committed by Gerrit Code Review
parent 9c645a2f48 22212491c6
commit dd1814c094
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ceilometerclient/shell.py
View File

@@ -204,19 +204,19 @@ class CeilometerShell(object):
subparser.add_argument(*args, **kwargs) subparser.add_argument(*args, **kwargs)
subparser.set_defaults(func=callback) subparser.set_defaults(func=callback)
def _setup_debugging(self, debug): def _setup_logging(self, debug):
format = '%(levelname)s (%(module)s:%(lineno)d) %(message)s'
if debug: if debug:
logging.basicConfig( logging.basicConfig(format=format, level=logging.DEBUG)
format="%(levelname)s (%(module)s:%(lineno)d) %(message)s",
level=logging.DEBUG)
httplib2.debuglevel = 1 httplib2.debuglevel = 1
else:
logging.basicConfig(format=format, level=logging.WARN)
def main(self, argv): def main(self, argv):
# Parse args once to find version # Parse args once to find version
parser = self.get_base_parser() parser = self.get_base_parser()
(options, args) = parser.parse_known_args(argv) (options, args) = parser.parse_known_args(argv)
self._setup_debugging(options.debug) self._setup_logging(options.debug)
# build available subcommands based on version # build available subcommands based on version
api_version = options.ceilometer_api_version api_version = options.ceilometer_api_version