Changeset 705


Ignore:
Timestamp:
03/21/13 17:13:30 (8 years ago)
Author:
ramonb
Message:
  • fix to GangliaConfigParser?.getSectionLastOption
  • more fixes so that GMETRIC and GMOND_CONF is really optional last resort
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/0.4/jobmond/jobmond.py

    r704 r705  
    375375                if c.has_key( option ):
    376376
    377                     cluster_name = c[ option ][0]
    378 
    379         return cluster_name
     377                    value = c[ option ][0]
     378
     379        return value
    380380
    381381    def getClusterName( self ):
     
    637637            self.binary = binary
    638638
    639         if not self.binary:
     639        if not self.binary and not GMETRIC_TARGET:
    640640            self.binary = GMETRIC_BINARY
    641641
     
    649649        self.dmax = str( int( int( BATCH_POLL_INTERVAL ) * 2 ) )
    650650
    651         if GMOND_CONF:
     651        if GMOND_CONF and not GMETRIC_TARGET:
    652652
    653653            incompatible = self.checkGmetricVersion()
     
    725725            except NameError:
    726726
    727                 debug_msg( 10, 'Assuming /etc/gmond.conf for gmetric cmd (omitting)' )
     727                debug_msg( 10, 'Assuming /etc/ganglia/gmond.conf for gmetric cmd' )
    728728
    729729            cmd = cmd + ' -n' + str( metricname )+ ' -v"' + str( metricval )+ '" -t' + str( valtype ) + ' -d' + str( self.dmax )
Note: See TracChangeset for help on using the changeset viewer.