Revision 3d975c75 snf-app/synnefo/logic/dispatcher.py

b/snf-app/synnefo/logic/dispatcher.py
229 229
def parse_arguments(args):
230 230
    from optparse import OptionParser
231 231

  
232
    default_pid_file = os.path.join("var","run","synnefo","dispatcher.pid")
232 233
    parser = OptionParser()
233 234
    parser.add_option("-d", "--debug", action="store_true", default=False,
234 235
                      dest="debug", help="Enable debug mode")
235 236
    parser.add_option("-w", "--workers", default=2, dest="workers",
236 237
                      help="Number of workers to spawn", type="int")
237
    parser.add_option("-p", '--pid-file', dest="pid_file",
238
                      default=os.path.join(os.getcwd(), "dispatcher.pid"),
239
                      help="Save PID to file (default:%s)" %
240
                           os.path.join(os.getcwd(), "dispatcher.pid"))
238
    parser.add_option("-p", "--pid-file", dest="pid_file",
239
                      default=default_pid_file,
240
                      help="Save PID to file (default: %s)" % default_pid_file)
241 241
    parser.add_option("--purge-queues", action="store_true",
242 242
                      default=False, dest="purge_queues",
243 243
                      help="Remove all declared queues (DANGEROUS!)")
......
416 416

  
417 417

  
418 418
def main():
419
    dictConfig(settings.DISPATCHER_LOGGING)
420

  
419 421
    global log
422

  
420 423
    (opts, args) = parse_arguments(sys.argv[1:])
421 424

  
422 425
    # Init the global variables containing the queues
......
461 464
        raise
462 465

  
463 466

  
464
def scriptmain():
465
    dictConfig(settings.DISPATCHER_LOGGING)
466
    sys.exit(main())
467

  
468 467
if __name__ == "__main__":
469
    scriptmain()
468
    sys.exit(main())
470 469

  
471 470
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :

Also available in: Unified diff