Changeset 449 for trunk

Timestamp:

07/20/07 10:19:55 (17 years ago)

Author:

bastiaans

Message:

jobmond/jobmond.py,
jobmond/jobmond.conf:

• added GMETRIC_BINARY option

Location:

trunk/jobmond

Files:

• jobmond.conf (modified) (1 diff)
• jobmond.py (modified) (4 diffs)

trunk/jobmond/jobmond.conf

@@ -39 +39 @@
 #
 #GMOND_CONF             : /etc/gmond.conf
+#
+# Location of gmetric binary
+#
+# Default: /usr/bin/gmetric
+#
+# DEPRECATED!:          use GMETRIC_TARGET!
+#
+#GMETRIC_BINARY         : /usr/bin/gmetric
 
 # Target of Gmetric's: where should we report to

trunk/jobmond/jobmond.py

@@ -118 +118 @@
         global GMOND_CONF, DETECT_TIME_DIFFS, BATCH_HOST_TRANSLATE
         global BATCH_API, QUEUE, GMETRIC_TARGET, USE_SYSLOG
-        global SYSLOG_LEVEL, SYSLOG_FACILITY
+        global SYSLOG_LEVEL, SYSLOG_FACILITY, GMETRIC_BINARY
 
         DEBUG_LEVEL     = cfg.getint( 'DEFAULT', 'DEBUG_LEVEL' )
@@ -135 +135 @@
 
                 debug_msg( 0, 'ERROR: no option USE_SYSLOG found: assuming yes' )
+
 
 
@@ -189 +190 @@
                 GMOND_CONF              = None
 
+        try:
+
+                GMETRIC_BINARY          = cfg.get( 'DEFAULT', 'GMETRIC_BINARY' )
+
+        except ConfigParser.NoOptionError:
+
+                GMETRIC_BINARY          = '/usr/bin/gmetric'
+
         DETECT_TIME_DIFFS       = cfg.getboolean( 'DEFAULT', 'DETECT_TIME_DIFFS' )
 
@@ -238 +247 @@
         """Class for processing of data"""
 
-        binary = '/usr/bin/gmetric'
+        binary = None
 
         def __init__( self, binary=None ):
 
                 """Remember alternate binary location if supplied"""
+
+                global GMETRIC_BINARY
 
                 if binary:
                         self.binary = binary
+
+                if not self.binary:
+                        self.binary = GMETRIC_BINARY
 
                 # Timeout for XML