Changeset 207 for trunk/web


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/web/addons/job_monarch/conf.php

    r206 r207  
    2323// XML Datasource for Toga
    2424// by default localhost's gmetad
     25// [syntax: <ip>:<port>]
    2526//
    2627$DATA_SOURCE = '127.0.0.1:8651';
     
    3031$JOB_ARCHIVE = 1;
    3132
    32 // Path to the job archive
     33// Path to the job archive rrd files
    3334//
    34 $JOB_ARCHIVE_DIR = '/data/jobarch/rrds';
     35$JOB_ARCHIVE_DIR = "/data/jobarch/rrds";
     36
     37// Location of the job archive database
     38// [syntax: <ip>/<dbase>]
     39//
     40$JOB_ARCHIVE_DBASE = "127.0.0.1/jobarch";
    3541
    3642// Path to rrdtool binary
    3743//
    38 $RRDTOOL = '/usr/bin/rrdtool';
    39 
     44$RRDTOOL = "/usr/bin/rrdtool";
    4045?>
  • trunk/web/addons/job_monarch/libtoga.php

    r206 r207  
    5757global $RRDTOOL;
    5858global $JOB_ARCHIVE_DIR;
     59global $JOB_ARCHIVE_DBASE;
    5960
    6061$my_dir = getcwd();
     
    9596
    9697        function TarchDbase( $ip = null, $dbase = 'jobarch' ) {
    97                 $this->ip = $ip;
    98                 $this->dbase = $dbase;
     98
     99                global $JOB_ARCHIVE_DBASE;
     100
     101                $db_fields = explode( '/', $JOB_ARCHIVE_DBASE );
     102
     103                $this->ip = $db_fields[0];
     104                $this->dbase = $db_fields[1];
    99105                $this->conn = null;
    100106        }
Note: See TracChangeset for help on using the changeset viewer.