Changeset 266 for trunk/jobmond


Ignore:
Timestamp:
06/26/06 13:38:27 (16 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/jobmond/jobmond.py

    r265 r266  
    106106
    107107                BATCH_SERVER = cfg.get( 'DEFAULT', 'TORQUE_SERVER' )
     108                api_guess = 'pbs'
    108109       
    109110        try:
     
    117118
    118119                BATCH_POLL_INTERVAL = cfg.getint( 'DEFAULT', 'TORQUE_POLL_INTERVAL' )
     120                api_guess = 'pbs'
     121               
    119122        GMOND_CONF = cfg.get( 'DEFAULT', 'GMOND_CONF' )
    120123
     
    123126        BATCH_HOST_TRANSLATE = getlist( cfg.get( 'DEFAULT', 'BATCH_HOST_TRANSLATE' ) )
    124127
    125         BATCH_API = cfg.get( 'DEFAULT', 'BATCH_API' )
    126 
     128        try:
     129
     130                BATCH_API = cfg.get( 'DEFAULT', 'BATCH_API' )
     131
     132        except ConfigParser.NoOptionError, detail:
     133
     134                if BATCH_SERVER and api_guess:
     135                        BATCH_API = api_guess
     136                else:
     137                        debug_msg( 0, "fatal error: BATCH_API not set and can't make guess" )
     138                        sys.exit( 1 )
     139       
    127140        return True
    128141
Note: See TracChangeset for help on using the changeset viewer.