Revision 796b5152 lib/tools/prepare_node_join.py

b/lib/tools/prepare_node_join.py
94 94
  return opts
95 95

  
96 96

  
97
def SetupLogging(opts):
98
  """Configures the logging module.
99

  
100
  """
101
  formatter = logging.Formatter("%(asctime)s: %(message)s")
102

  
103
  stderr_handler = logging.StreamHandler()
104
  stderr_handler.setFormatter(formatter)
105
  if opts.debug:
106
    stderr_handler.setLevel(logging.NOTSET)
107
  elif opts.verbose:
108
    stderr_handler.setLevel(logging.INFO)
109
  else:
110
    stderr_handler.setLevel(logging.WARNING)
111

  
112
  root_logger = logging.getLogger("")
113
  root_logger.setLevel(logging.NOTSET)
114
  root_logger.addHandler(stderr_handler)
115

  
116

  
117 97
def _VerifyCertificate(cert, _noded_cert_file=pathutils.NODED_CERT_FILE):
118 98
  """Verifies a certificate against the local node daemon certificate.
119 99

  
......
319 299
  """
320 300
  opts = ParseOptions()
321 301

  
322
  SetupLogging(opts)
302
  utils.SetupToolLogging(opts.debug, opts.verbose)
323 303

  
324 304
  try:
325 305
    data = LoadData(sys.stdin.read())

Also available in: Unified diff