Changeset 455

Timestamp:

02/05/08 16:26:24 (15 years ago)

Author:

bastiaans

Message:

jobarchived/jobarchived.py:

• fix to py-rrdtool module detection

jobarchived/examples/jobarchived.conf:

• more sensible default path

Location:

trunk/jobarchived

Files:

• examples/jobarchived.conf (modified) (1 diff)
• jobarchived.py (modified) (3 diffs)

trunk/jobarchived/examples/jobarchived.conf

@@ -10 +10 @@
 ARCHIVE_HOURS_PER_RRD           : 12
 ARCHIVE_EXCLUDE_METRICS         : "^Temp_.*_.*", ".*_Temp_.*", ".*_RPM_.*", ".*_Battery_.*"
-ARCHIVE_PATH                    : /data/jobarch/rrds
+ARCHIVE_PATH                    : /var/lib/jobarch/rrds
 JOB_SQL_DBASE                   : localhost/jobarch

trunk/jobarchived/jobarchived.py

@@ -152 +152 @@
                 debug_msg( 0, "ERROR: py-rrdtool import FAILED: failing back to DEPRECATED use of rrdtool binary. This will slow down jobmond significantly!" )
 
+                RRDTOOL                 = cfg.get( 'DEFAULT', 'RRDTOOL' )
+
         try:
 
@@ -175 +177 @@
         DAEMONIZE               = cfg.getboolean( 'DEFAULT', 'DAEMONIZE' )
 
-        RRDTOOL                 = cfg.get( 'DEFAULT', 'RRDTOOL' )
 
         return True
@@ -1481 +1482 @@
                 """Setup initial variables"""
 
+                global MODRRDTOOL
+
                 self.block      = 0
                 self.cluster    = cluster
                 self.config     = config
                 self.slot       = threading.Lock()
-                self.rrdm       = RRDMutator( RRDTOOL )
+
+                if MODRRDTOOL:
+
+                        self.rrdm       = RRDMutator()
+                else:
+                        self.rrdm       = RRDMutator( RRDTOOL )
 
                 global DEBUG_LEVEL