Changeset 266 for trunk/jobmond/jobmond.py

Timestamp:

06/26/06 13:38:27 (17 years ago)

Author:

bastiaans

Message:

jobmond/jobmond.py:

• try to guess api 'pbs' for old configs

web/addons/job_monarch/index.php:

• changed makeHeader() to check for page_call. this will prevent multiple Jobarchive link/images in the header, by multiple calls

web/addons/job_monarch/overview.php:

• added makeHeader() call and filter[id] set. when only 1 job is found, it now automaticly jumps to show_hosts and sets correct filter in header html

File:

• trunk/jobmond/jobmond.py (modified) (3 diffs)

trunk/jobmond/jobmond.py

@@ -106 +106 @@
 
                 BATCH_SERVER = cfg.get( 'DEFAULT', 'TORQUE_SERVER' )
+                api_guess = 'pbs'
         
         try:
@@ -117 +118 @@
 
                 BATCH_POLL_INTERVAL = cfg.getint( 'DEFAULT', 'TORQUE_POLL_INTERVAL' )
+                api_guess = 'pbs'
+                
         GMOND_CONF = cfg.get( 'DEFAULT', 'GMOND_CONF' )
 
@@ -123 +126 @@
         BATCH_HOST_TRANSLATE = getlist( cfg.get( 'DEFAULT', 'BATCH_HOST_TRANSLATE' ) )
 
-        BATCH_API = cfg.get( 'DEFAULT', 'BATCH_API' )
-
+        try:
+
+                BATCH_API = cfg.get( 'DEFAULT', 'BATCH_API' )
+
+        except ConfigParser.NoOptionError, detail:
+
+                if BATCH_SERVER and api_guess:
+                        BATCH_API = api_guess
+                else:
+                        debug_msg( 0, "fatal error: BATCH_API not set and can't make guess" )
+                        sys.exit( 1 )
+        
         return True