Changeset 337

Timestamp:

04/23/07 20:46:46 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/conf.php:

• added CLUSTER_CONFS example for cluster specific config's

web/addons/job_monarch/libtoga.php:

• include per-cluster specific settings if available for clusterimage

Location:

trunk/web/addons/job_monarch

Files:

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

trunk/web/addons/job_monarch/conf.php

@@ -1 +1 @@
 <?php
+
+$CLUSTER_CONFS["LISA Cluster"]  = "./clusterconf/lisa.php";
 
 // Sort nodes in clusterimage by
 //
-$SORTBY_HOSTNAME = "gb-r{x}n{y}.irc.sara.nl";
-$SORT_ORDER = "asc";
+//$SORTBY_HOSTNAME = "gb-r{x}n{y}.irc.sara.nl";
+//$SORT_ORDER = "asc";
 
-$SORT_XLABEL = "rack";
-$SORT_YLABEL = "node";
+//$SORT_XLABEL = "rack";
+//$SORT_YLABEL = "node";
 
 // Show hosts in a jobview by default?

trunk/web/addons/job_monarch/libtoga.php

@@ -68 +68 @@
 }
 
+$CLUSTER_CONFS  = array();
+
 // Toga's conf
 //
@@ -77 +79 @@
 global $JOB_ARCHIVE_DIR;
 global $JOB_ARCHIVE_DBASE;
-global $SORTBY_HOSTNAME;
-global $SORT_ORDER;
+//global $SORTBY_HOSTNAME;
+//global $SORT_ORDER;
 global $skan_str;
 global $x_first, $y_first;
-global $SORT_XLABEL, $SORT_YLABEL;
+//global $SORT_XLABEL, $SORT_YLABEL;
+global $CLUSTER_CONFS;
 
 $my_dir = getcwd();
@@ -1058 +1061 @@
                 global $SMALL_CLUSTERIMAGE_MAXWIDTH, $SMALL_CLUSTERIMAGE_NODEWIDTH;
                 global $BIG_CLUSTERIMAGE_MAXWIDTH, $BIG_CLUSTERIMAGE_NODEWIDTH;
-
-                global $SORTBY_HOSTNAME, $SORT_ORDER, $skan_str;
+                global $CLUSTER_CONFS;
+
+                //global $SORTBY_HOSTNAME, $SORT_ORDER, $skan_str;
+                global $skan_str;
                 global $x_first, $y_first;
 
+                foreach( $CLUSTER_CONFS as $confcluster => $conffile )
+                {
+                        if( strtolower( $this->clustername ) == $confcluster )
+                        {
+                                include_once $conffile;
+                        }
+                }
+
+                global $SORTBY_HOSTNAME, $SORT_ORDER;
                 global $SORT_XLABEL, $SORT_YLABEL;