Changeset 337


Ignore:
Timestamp:
04/23/07 20:46:46 (15 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:
2 edited

Legend:

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

    r333 r337  
    11<?php
     2
     3$CLUSTER_CONFS["LISA Cluster"]  = "./clusterconf/lisa.php";
    24
    35// Sort nodes in clusterimage by
    46//
    5 $SORTBY_HOSTNAME = "gb-r{x}n{y}.irc.sara.nl";
    6 $SORT_ORDER = "asc";
     7//$SORTBY_HOSTNAME = "gb-r{x}n{y}.irc.sara.nl";
     8//$SORT_ORDER = "asc";
    79
    8 $SORT_XLABEL = "rack";
    9 $SORT_YLABEL = "node";
     10//$SORT_XLABEL = "rack";
     11//$SORT_YLABEL = "node";
    1012
    1113// Show hosts in a jobview by default?
  • trunk/web/addons/job_monarch/libtoga.php

    r333 r337  
    6868}
    6969
     70$CLUSTER_CONFS  = array();
     71
    7072// Toga's conf
    7173//
     
    7779global $JOB_ARCHIVE_DIR;
    7880global $JOB_ARCHIVE_DBASE;
    79 global $SORTBY_HOSTNAME;
    80 global $SORT_ORDER;
     81//global $SORTBY_HOSTNAME;
     82//global $SORT_ORDER;
    8183global $skan_str;
    8284global $x_first, $y_first;
    83 global $SORT_XLABEL, $SORT_YLABEL;
     85//global $SORT_XLABEL, $SORT_YLABEL;
     86global $CLUSTER_CONFS;
    8487
    8588$my_dir = getcwd();
     
    10581061                global $SMALL_CLUSTERIMAGE_MAXWIDTH, $SMALL_CLUSTERIMAGE_NODEWIDTH;
    10591062                global $BIG_CLUSTERIMAGE_MAXWIDTH, $BIG_CLUSTERIMAGE_NODEWIDTH;
    1060 
    1061                 global $SORTBY_HOSTNAME, $SORT_ORDER, $skan_str;
     1063                global $CLUSTER_CONFS;
     1064
     1065                //global $SORTBY_HOSTNAME, $SORT_ORDER, $skan_str;
     1066                global $skan_str;
    10621067                global $x_first, $y_first;
    10631068
     1069                foreach( $CLUSTER_CONFS as $confcluster => $conffile )
     1070                {
     1071                        if( strtolower( $this->clustername ) == $confcluster )
     1072                        {
     1073                                include_once $conffile;
     1074                        }
     1075                }
     1076
     1077                global $SORTBY_HOSTNAME, $SORT_ORDER;
    10641078                global $SORT_XLABEL, $SORT_YLABEL;
    10651079       
Note: See TracChangeset for help on using the changeset viewer.