Revision d4fa5c23 daemons/ganeti-masterd

b/daemons/ganeti-masterd
393 393

  
394 394
  logger.SetupDaemon(constants.LOG_MASTERDAEMON, debug=options.debug)
395 395

  
396
  logger.Info("ganeti master daemon startup")
396
  logging.info("ganeti master daemon startup")
397 397

  
398
  master.setup_queue()
398 399
  try:
399
    utils.Lock('cmd', debug=options.debug)
400
  except errors.LockError, err:
401
    print >> sys.stderr, str(err)
402
    master.server_cleanup()
403
    return
404

  
405
  try:
406
    master.setup_queue()
407
    try:
408
      master.serve_forever()
409
    finally:
410
      master.server_cleanup()
400
    master.serve_forever()
411 401
  finally:
412
    utils.Unlock('cmd')
413
    utils.LockCleanup()
402
    master.server_cleanup()
414 403

  
415 404

  
416 405
if __name__ == "__main__":

Also available in: Unified diff