Revision eda37a5a

b/tools/cfgupgrade
33 33
import optparse
34 34
import tempfile
35 35
import simplejson
36
import logging
36 37

  
37 38
from ganeti import utils
38 39
from ganeti import cli
......
104 105
  cfg['cluster']['config_version'] = 3
105 106

  
106 107

  
108
def SetupLogging():
109
  """Configures the logging module.
110

  
111
  """
112
  formatter = logging.Formatter("%(asctime)s: %(message)s")
113

  
114
  stderr_handler = logging.StreamHandler()
115
  stderr_handler.setFormatter(formatter)
116
  if options.debug:
117
    stderr_handler.setLevel(logging.NOTSET)
118
  elif options.verbose:
119
    stderr_handler.setLevel(logging.INFO)
120
  else:
121
    stderr_handler.setLevel(logging.CRITICAL)
122

  
123
  root_logger = logging.getLogger("")
124
  root_logger.setLevel(logging.NOTSET)
125
  root_logger.addHandler(stderr_handler)
126

  
127

  
107 128
# Main program
108 129
if __name__ == "__main__":
109 130
  program = os.path.basename(sys.argv[0])
......
115 136
                    help="Try to do the conversion, but don't write"
116 137
                         " output file")
117 138
  parser.add_option(cli.FORCE_OPT)
139
  parser.add_option(cli.DEBUG_OPT)
118 140
  parser.add_option('--verbose', dest='verbose',
119 141
                    action="store_true",
120 142
                    help="Verbose output")
121 143
  (options, args) = parser.parse_args()
122 144

  
145
  SetupLogging()
146

  
123 147
  # Option checking
124 148
  if args:
125 149
    cfg_file = args[0]

Also available in: Unified diff