Changeset 686 for branches/0.3/web/addons

Timestamp:

11/28/12 16:21:51 (10 years ago)

Author:

ramonb

Message:

• ganglia-web compatibility fixes

Location:

branches/0.3/web/addons/job_monarch

Files:

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

branches/0.3/web/addons/job_monarch/conf.php

@@ -22 +22 @@
 // Path to Ganglia's web frontend root
 //
-$GANGLIA_PATH = "/var/www/test-ganglia";
+$GANGLIA_PATH = "/data/ganglia-web-current/";
 //$GANGLIA_PATH = "../..";
 
@@ -79 +79 @@
 // Is there a jobarchive?
 //
-$JOB_ARCHIVE = true;
+$JOB_ARCHIVE = false;
 
 // Path to the job archive rrd files

branches/0.3/web/addons/job_monarch/index.php

@@ -23 +23 @@
  */
 
-ini_set("memory_limit","100M");
+ini_set("memory_limit","500M");
 set_time_limit(0);
 
@@ -40 +40 @@
 
 global $GANGLIA_PATH;
-chdir( $GANGLIA_PATH );
+//chdir( $GANGLIA_PATH );
 
 include_once "./class.TemplatePower.inc.php";
-chdir( $my_dir );
+//chdir( $my_dir );
 
 $httpvars = new HTTPVariables( $HTTP_GET_VARS, $_GET );

branches/0.3/web/addons/job_monarch/libtoga.php

@@ -85 +85 @@
 $CLUSTER_CONFS  = array();
 
-ini_set("memory_limit","1024000000");
+ini_set("memory_limit","500M");
 set_time_limit(0);
 
@@ -106 +106 @@
 chdir( $GANGLIA_PATH );
 
-include_once "./conf.php";
+//include_once "./conf.php";
+include_once "./eval_conf.php";
 include_once "./functions.php";
 include_once "./ganglia.php";
@@ -822 +823 @@
                                                                 if( !in_array( $node, $jobs[$jobid][$toganame] ) )
                                                                 {
-                                                                        $jobs[$jobid][$toganame][] = $node;
+                                    array_push( $jobs[$jobid][$toganame], $node );
                                                                 }
                                                         }