Changeset 207

Timestamp:

01/06/06 15:33:08 (17 years ago)

Author:

bastiaans

Message:

job_monarch/conf.php:

• added option JOB_ARCHIVE_DBASE

job_monarch/libtoga.php:

• added usage of option JOB_ARCHIVE_DBASE

Location:

trunk/web/addons/job_monarch

Files:

• conf.php (modified) (2 diffs)
• libtoga.php (modified) (2 diffs)

trunk/web/addons/job_monarch/conf.php

@@ -23 +23 @@
 // XML Datasource for Toga
 // by default localhost's gmetad
+// [syntax: <ip>:<port>]
 //
 $DATA_SOURCE = '127.0.0.1:8651';
@@ -30 +31 @@
 $JOB_ARCHIVE = 1;
 
-// Path to the job archive
+// Path to the job archive rrd files
 //
-$JOB_ARCHIVE_DIR = '/data/jobarch/rrds';
+$JOB_ARCHIVE_DIR = "/data/jobarch/rrds";
+
+// Location of the job archive database
+// [syntax: <ip>/<dbase>]
+//
+$JOB_ARCHIVE_DBASE = "127.0.0.1/jobarch";
 
 // Path to rrdtool binary
 //
-$RRDTOOL = '/usr/bin/rrdtool';
-
+$RRDTOOL = "/usr/bin/rrdtool";
 ?>

trunk/web/addons/job_monarch/libtoga.php

@@ -57 +57 @@
 global $RRDTOOL;
 global $JOB_ARCHIVE_DIR;
+global $JOB_ARCHIVE_DBASE;
 
 $my_dir = getcwd();
@@ -95 +96 @@
 
         function TarchDbase( $ip = null, $dbase = 'jobarch' ) {
-                $this->ip = $ip;
-                $this->dbase = $dbase;
+
+                global $JOB_ARCHIVE_DBASE;
+
+                $db_fields = explode( '/', $JOB_ARCHIVE_DBASE );
+
+                $this->ip = $db_fields[0];
+                $this->dbase = $db_fields[1];
                 $this->conn = null;
         }