Changeset 265 for trunk/jobmond

Timestamp:

06/26/06 12:46:51 (17 years ago)

Author:

bastiaans

Message:

jobmond/jobmond.py:

• changed option parsing to be backwards compatible with old configs

File:

• trunk/jobmond/jobmond.py (modified) (1 diff)

trunk/jobmond/jobmond.py

@@ -96 +96 @@
         DAEMONIZE = cfg.getboolean( 'DEFAULT', 'DAEMONIZE' )
 
-        BATCH_SERVER = cfg.get( 'DEFAULT', 'BATCH_SERVER' )
-
-        BATCH_POLL_INTERVAL = cfg.getint( 'DEFAULT', 'BATCH_POLL_INTERVAL' )
-
+        try:
+
+                BATCH_SERVER = cfg.get( 'DEFAULT', 'BATCH_SERVER' )
+
+        except ConfigParser.NoOptionError:
+
+                # Backwards compatibility for old configs
+                #
+
+                BATCH_SERVER = cfg.get( 'DEFAULT', 'TORQUE_SERVER' )
+        
+        try:
+        
+                BATCH_POLL_INTERVAL = cfg.getint( 'DEFAULT', 'BATCH_POLL_INTERVAL' )
+
+        except ConfigParser.NoOptionError:
+
+                # Backwards compatibility for old configs
+                #
+
+                BATCH_POLL_INTERVAL = cfg.getint( 'DEFAULT', 'TORQUE_POLL_INTERVAL' )
         GMOND_CONF = cfg.get( 'DEFAULT', 'GMOND_CONF' )