Skip to content
Snippets Groups Projects
Commit eda37a5a authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

cfgupgrade: Add logging module

Reviewed-by: iustinp
parent 740c5aab
No related branches found
No related tags found
No related merge requests found
...@@ -33,6 +33,7 @@ import sys ...@@ -33,6 +33,7 @@ import sys
import optparse import optparse
import tempfile import tempfile
import simplejson import simplejson
import logging
from ganeti import utils from ganeti import utils
from ganeti import cli from ganeti import cli
...@@ -104,6 +105,26 @@ def UpdateFromVersion2To3(cfg): ...@@ -104,6 +105,26 @@ def UpdateFromVersion2To3(cfg):
cfg['cluster']['config_version'] = 3 cfg['cluster']['config_version'] = 3
def SetupLogging():
"""Configures the logging module.
"""
formatter = logging.Formatter("%(asctime)s: %(message)s")
stderr_handler = logging.StreamHandler()
stderr_handler.setFormatter(formatter)
if options.debug:
stderr_handler.setLevel(logging.NOTSET)
elif options.verbose:
stderr_handler.setLevel(logging.INFO)
else:
stderr_handler.setLevel(logging.CRITICAL)
root_logger = logging.getLogger("")
root_logger.setLevel(logging.NOTSET)
root_logger.addHandler(stderr_handler)
# Main program # Main program
if __name__ == "__main__": if __name__ == "__main__":
program = os.path.basename(sys.argv[0]) program = os.path.basename(sys.argv[0])
...@@ -115,11 +136,14 @@ if __name__ == "__main__": ...@@ -115,11 +136,14 @@ if __name__ == "__main__":
help="Try to do the conversion, but don't write" help="Try to do the conversion, but don't write"
" output file") " output file")
parser.add_option(cli.FORCE_OPT) parser.add_option(cli.FORCE_OPT)
parser.add_option(cli.DEBUG_OPT)
parser.add_option('--verbose', dest='verbose', parser.add_option('--verbose', dest='verbose',
action="store_true", action="store_true",
help="Verbose output") help="Verbose output")
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
SetupLogging()
# Option checking # Option checking
if args: if args:
cfg_file = args[0] cfg_file = args[0]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment