Changeset 864 for branches/1.0/jobmond/jobmond.py

Timestamp:

05/15/13 18:13:55 (10 years ago)

Author:

ramonb

Message:

jobmond.py:

• BATCH_SERVER no longer required: only pbs api support remote connections
• BATCH_API guessing removed: is now required to be set

File:

• branches/1.0/jobmond/jobmond.py (modified) (2 diffs)

branches/1.0/jobmond/jobmond.py

@@ -539 +539 @@
     except ConfigParser.NoOptionError:
 
-        # Backwards compatibility for old configs
-        #
-
-        BATCH_SERVER = cfg.get( 'DEFAULT', 'TORQUE_SERVER' )
-        api_guess    = 'pbs'
-    
+        # Not required for all API's: only pbs api allows remote connections
+        BATCH_SERVER = None
+
     try:
     
@@ -618 +615 @@
     except ConfigParser.NoOptionError, detail:
 
-        if BATCH_SERVER and api_guess:
-
-            BATCH_API    = api_guess
-        else:
-            print "FATAL ERROR: BATCH_API not set and can't make guess"
-            sys.exit( 1 )
+        print "FATAL ERROR: BATCH_API not set"
+        sys.exit( 1 )
 
     try: