Changeset 705 for branches/0.4/jobmond

Timestamp:

03/21/13 17:13:30 (10 years ago)

Author:

ramonb

Message:

• fix to GangliaConfigParser?.getSectionLastOption
• more fixes so that GMETRIC and GMOND_CONF is really optional last resort

File:

• branches/0.4/jobmond/jobmond.py (modified) (4 diffs)

branches/0.4/jobmond/jobmond.py

@@ -375 +375 @@
                 if c.has_key( option ):
 
-                    cluster_name = c[ option ][0]
-
-        return cluster_name
+                    value = c[ option ][0]
+
+        return value
 
     def getClusterName( self ):
@@ -637 +637 @@
             self.binary = binary
 
-        if not self.binary:
+        if not self.binary and not GMETRIC_TARGET:
             self.binary = GMETRIC_BINARY
 
@@ -649 +649 @@
         self.dmax = str( int( int( BATCH_POLL_INTERVAL ) * 2 ) )
 
-        if GMOND_CONF:
+        if GMOND_CONF and not GMETRIC_TARGET:
 
             incompatible = self.checkGmetricVersion()
@@ -725 +725 @@
             except NameError:
 
-                debug_msg( 10, 'Assuming /etc/gmond.conf for gmetric cmd (omitting)' )
+                debug_msg( 10, 'Assuming /etc/ganglia/gmond.conf for gmetric cmd' )
 
             cmd = cmd + ' -n' + str( metricname )+ ' -v"' + str( metricval )+ '" -t' + str( valtype ) + ' -d' + str( self.dmax )