Changeset 686 for branches/0.3


Ignore:
Timestamp:
11/28/12 16:21:51 (8 years ago)
Author:
ramonb
Message:
  • ganglia-web compatibility fixes
Location:
branches/0.3/web/addons/job_monarch
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/0.3/web/addons/job_monarch/conf.php

    r614 r686  
    2222// Path to Ganglia's web frontend root
    2323//
    24 $GANGLIA_PATH = "/var/www/test-ganglia";
     24$GANGLIA_PATH = "/data/ganglia-web-current/";
    2525//$GANGLIA_PATH = "../..";
    2626
     
    7979// Is there a jobarchive?
    8080//
    81 $JOB_ARCHIVE = true;
     81$JOB_ARCHIVE = false;
    8282
    8383// Path to the job archive rrd files
  • branches/0.3/web/addons/job_monarch/index.php

    r527 r686  
    2323 */
    2424
    25 ini_set("memory_limit","100M");
     25ini_set("memory_limit","500M");
    2626set_time_limit(0);
    2727
     
    4040
    4141global $GANGLIA_PATH;
    42 chdir( $GANGLIA_PATH );
     42//chdir( $GANGLIA_PATH );
    4343
    4444include_once "./class.TemplatePower.inc.php";
    45 chdir( $my_dir );
     45//chdir( $my_dir );
    4646
    4747$httpvars = new HTTPVariables( $HTTP_GET_VARS, $_GET );
  • branches/0.3/web/addons/job_monarch/libtoga.php

    r654 r686  
    8585$CLUSTER_CONFS  = array();
    8686
    87 ini_set("memory_limit","1024000000");
     87ini_set("memory_limit","500M");
    8888set_time_limit(0);
    8989
     
    106106chdir( $GANGLIA_PATH );
    107107
    108 include_once "./conf.php";
     108//include_once "./conf.php";
     109include_once "./eval_conf.php";
    109110include_once "./functions.php";
    110111include_once "./ganglia.php";
     
    822823                                                                if( !in_array( $node, $jobs[$jobid][$toganame] ) )
    823824                                                                {
    824                                                                         $jobs[$jobid][$toganame][] = $node;
     825                                    array_push( $jobs[$jobid][$toganame], $node );
    825826                                                                }
    826827                                                        }
Note: See TracChangeset for help on using the changeset viewer.