Changeset 219 for trunk/web/addons

Timestamp:

03/08/06 13:09:30 (17 years ago)

Author:

bastiaans

Message:

TODO:

• updated

AUTHORS:

• updated

jobmond/jobmond.py,
web/addons/job_monarch/libtoga.php:

• renamed metric internals from TOGA to MONARCH

web/addons/job_monarch/conf.php:

• renamed comment from Toga to Job Monarch

Location:

trunk/web/addons/job_monarch

Files:

• conf.php (modified) (1 diff)
• libtoga.php (modified) (1 diff)

trunk/web/addons/job_monarch/conf.php

@@ -21 +21 @@
 $JOB_NODE_MARKING = "J";
 
-// XML Datasource for Toga
+// XML Datasource for Job Monarch
 // by default localhost's gmetad
 // [syntax: <ip>:<port>]

trunk/web/addons/job_monarch/libtoga.php

@@ -528 +528 @@
                                 $nodes[$hostname] = new NodeImage( $hostname );
 
-                } else if( $name == 'METRIC' and strstr( $attrs[NAME], 'TOGA' ) and $this->proc_cluster == $this->clustername ) {
-
-                        if( strstr( $attrs[NAME], 'TOGA-HEARTBEAT' ) ) {
+                } else if( $name == 'METRIC' and strstr( $attrs[NAME], 'MONARCH' ) and $this->proc_cluster == $this->clustername ) {
+
+                        if( strstr( $attrs[NAME], 'MONARCH-HEARTBEAT' ) ) {
 
                                 $this->heartbeat['time'] = $attrs[VAL];
                                 //printf( "heartbeat %s\n", $heartbeat['time'] );
 
-                        } else if( strstr( $attrs[NAME], 'TOGA-JOB' ) ) {
-
-                                sscanf( $attrs[NAME], 'TOGA-JOB-%d', $jobid );
+                        } else if( strstr( $attrs[NAME], 'MONARCH-JOB' ) ) {
+
+                                sscanf( $attrs[NAME], 'MONARCH-JOB-%d', $jobid );
 
                                 //printf( "jobid %s\n", $jobid );