extras-buildsys/server main.py,1.14,1.15

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22605/server

Modified Files:
	main.py 
Log Message:
2005-10-27  Dan Williams  <dcbw at redhat.com>

    Patch from Jeff Sheltren <sheltren at cs.ucsb.edu>
    * server/main.py
        - Honor config file location passed in on command line




Index: main.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/main.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- main.py	9 Sep 2005 15:10:17 -0000	1.14
+++ main.py	27 Oct 2005 14:34:35 -0000	1.15
@@ -58,7 +58,7 @@
 #################################################################
 
 if __name__ == '__main__':
-    usage = "Usage: %s [-p <pidfile>] [-l <logfile>] [-d] -c <configfile>" % sys.argv[0]
+    usage = "Usage: %s [-p <pidfile>] [-l <logfile>] [-d] [-c <configfile>]" % sys.argv[0]
     parser = OptionParser(usage=usage)
     parser.add_option("-p", "--pidfile", default=None,
         help='file to write the PID to')
@@ -66,8 +66,8 @@
         help="location of file to write log output to")
     parser.add_option("-d", "--daemon", default=False, action="store_true",
         help="daemonize (i.e., detach from the terminal)")
-    parser.add_option("-c", "--configfile", default=None,
-        help='server configuration file')
+    parser.add_option("-c", "--configfile", default="/etc/plague/server/plague-server.cfg",
+        help='server configuration file, default: /etc/plague/server/plague-server.cfg')
     (opts, args) = parser.parse_args()
 
     if not opts.configfile:
@@ -90,7 +90,7 @@
         sys.stderr=log
 
     # Load in our config, filling in with defaults if it doesn't exist
-    cfg = Config.ServerConfig("/etc/plague/server/plague-server.cfg")
+    cfg = Config.ServerConfig(opts.configfile)
     cfg.load_target_configs()
     if len(cfg.targets()) == 0:
         print "You need at least one target to do anything useful."