Index: branches/eam_branches/ipp-20110213/ippMonitor/def/stackInputSkyfile.d =================================================================== --- branches/eam_branches/ipp-20110213/ippMonitor/def/stackInputSkyfile.d (revision 30812) +++ branches/eam_branches/ipp-20110213/ippMonitor/def/stackInputSkyfile.d (revision 31083) @@ -13,4 +13,7 @@ WHERE camRun.chip_id = chipRun.chip_id WHERE chipRun.exp_id = rawExp.exp_id + +# if no query restrictions are supplied, we want to limit the query or it is extremely long running: +UNRESTRICTED AND stackRun.stack_id = 0 ARGS ARG1 rawImfile.exp_id=$rawExp.exp_id Index: branches/eam_branches/ipp-20110213/ippMonitor/raw/czartool_getplot.php =================================================================== --- branches/eam_branches/ipp-20110213/ippMonitor/raw/czartool_getplot.php (revision 30812) +++ branches/eam_branches/ipp-20110213/ippMonitor/raw/czartool_getplot.php (revision 31083) @@ -17,5 +17,5 @@ $plottype = $_GET[plottype]; -if ($type=="t" || $type=="r") +if ($type=="t" || $type=="r" || $type=="rt" || $type=="rh") $filePath = "/tmp/czarplot_".$plottype."_".$label."_".$stage."_".$type.".png"; else if ($type=="h") @@ -23,4 +23,7 @@ else if ($type=="s") $filePath = "/tmp/czarplot_hosts_space.png"; +else if ($type=="st") +$filePath = "/tmp/czarplot_cluster.png"; + $file = fopen ($filePath, "r"); Index: branches/eam_branches/ipp-20110213/ippMonitor/raw/czartool_labels.php =================================================================== --- branches/eam_branches/ipp-20110213/ippMonitor/raw/czartool_labels.php (revision 30812) +++ branches/eam_branches/ipp-20110213/ippMonitor/raw/czartool_labels.php (revision 31083) @@ -14,4 +14,5 @@ $gpc1db = dbconnect($ID['proj']); + $PATH = getenv("PATH"); putenv("PATH=$BINDIR:$PATH"); @@ -27,5 +28,5 @@ $states=array("full","new","drop","wait"); -$stages=array("burntool", "chip","cam","fake","warp","stack","diff","magic","magicDS","dist"); +$stages=array("burntool", "chip","cam","fake","warp","stack","diff","magic","magicDS","dist", "pub"); $servers=array( "addstar", @@ -58,12 +59,4 @@ if ($plotType == "") { $plotType = "linear"; } -$nsStatus = getNightlyScienceStatus($czardb); -$plotTypeLink = ($plotType == "linear") ? "log" : "linear"; -$link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotTypeLink"; -echo "

Current ippMonitor SVN version: "; -include 'version.php'; -echo "

"; -echo "

Current status of the IPP as of $lastUpdateTime (faults are shown in parentheses).
Documentation can be found here and cluster load monitored here
Current nightly science status: $nsStatus
Use $plotTypeLink plots
Who uses the cluster?
IPP Metrics
Czar log pages
Exposure summary

"; - // deal with reverts: turn on or off if requested and pass current revert state for this stage onto labels table later if ($selectedRevertStage && $selectedRevertMode) turnRevertsOnOff($czardb, $selectedRevertStage, $selectedRevertMode); @@ -102,131 +95,103 @@ echo "\n"; - echo "\n"; - - - # 1st row - echo "\n"; - echo " \n"; - echo "\n"; - - - - # 2nd row - echo "\n"; - echo " \n"; - echo "\n"; - - - # 3rd row - echo "\n"; - echo " \n"; - echo "\n"; - - # 4th row - echo "\n"; - echo " \n"; - echo "\n"; - - # 5th row - echo "\n"; - echo " \n"; - echo "\n"; - - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; - # timeseries plot - echo "
"; - echo "		\n"; - createLabelsTable($pass, - $proj, - $czardb, - "stdscience", - $stdsLabels, - $distLabels, - $pubLabels, - $stages, - $states, - "new", - $selectedLabel, - $selectedStage, - $plotType); - echo "
\n"; - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; - # rate plot - echo "
"; - echo "		\n"; - createLabelsTable($pass, - $proj, - $czardb, - "update", - $updateLabels, - $distLabels, - $pubLabels, - $stages, - $states, - "new", - $selectedLabel, - $selectedStage, - $plotType); - echo "
\n"; - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "
\n"; - # histogram plot - echo "
"; - echo "		\n"; - createServersTable($pass, $proj,$czardb, $servers, $selectedLabel, $selectedStage, $plotType); - echo " \n"; - $today = date("Y-m-d"); - createSummitDataTable($gpc1db, $today); - echo "
\n"; - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; - # storage plot - echo "
"; - echo "		\n"; - createDatesTable($czardb); - echo "
\n"; - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; - if ($selectedServer && !$serverCmd) showServerStatus($selectedServer); - echo "\n"; - # This is awful - echo ""; - echo ""; - echo ""; - showReplicationsStatus($REPL_HOST_GPC1, $REPL_USER_GPC1, $REPL_PASSWORD_GPC1, $REPL_DBNAME_GPC1); - showReplicationsStatus($REPL_HOST_NEBULOUS, $REPL_USER_NEBULOUS, $REPL_PASSWORD_NEBULOUS, $REPL_DBNAME_NEBULOUS); - showReplicationsStatus($REPL_HOST_PSTAMP, $REPL_USER_PSTAMP, $REPL_PASSWORD_PSTAMP, $REPL_DBNAME_PSTAMP); - echo "
Databases Replication Status
Update fix log here
DatabaseReplication Status
"; - echo "
\n"; - echo "
\n"; +echo ""; + +echo ""; +echo ""; +echo ""; + +echo ""; +echo ""; +echo "
"; +echo "

Czartool

"; +echo "
"; + # time series plot + echo "
"; + # rate time series plot + echo "
"; + # rate stacked histo plot + echo "
"; + # histogram plot + echo "
"; + # storage timeseries + echo "
"; + # storage plot + echo "
"; + # pantasks server status, if requested + if ($selectedServer && !$serverCmd) showServerStatus($selectedServer); +echo "		"; + +echo "

"; + +// status table at top +$nsStatus = getNightlyScienceStatus($czardb); +$plotTypeLink = ($plotType == "linear") ? "log" : "linear"; +$link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotTypeLink"; +echo "\n"; +echo "\n"; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo "
Time of last update$lastUpdateTime
ippMonitor SVN version"; include 'version.php'; echo "
Current nightly science status$nsStatus
Postage stamp server statushere
Documentationhere
Cluster loadhere
Who's using the cluster?here
IPP metricshere
Czar log pageshere
Exposure summaryhere
\n"; + +echo "

"; + + createLabelsTable($pass, + $proj, + $czardb, + "stdscience", + $stdsLabels, + $distLabels, + $pubLabels, + $stages, + $states, + "new", + $selectedLabel, + $selectedStage, + $plotType); + +echo "

"; + createLabelsTable($pass, + $proj, + $czardb, + "update", + $updateLabels, + $distLabels, + $pubLabels, + $stages, + $states, + "new", + $selectedLabel, + $selectedStage, + $plotType); +echo "

"; + createServersTable($pass, $proj,$czardb, $servers, $selectedLabel, $selectedStage, $plotType); +echo "

"; + createSummitDataTable($gpc1db); +echo "

"; + createDatesTable($czardb); +echo "

"; + createPStampDataTable(); +echo "

"; + # This is awful + echo "\n"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + showReplicationsStatus($REPL_HOST_GPC1, $REPL_USER_GPC1, $REPL_PASSWORD_GPC1, $REPL_DBNAME_GPC1); + showReplicationsStatus($REPL_HOST_NEBULOUS, $REPL_USER_NEBULOUS, $REPL_PASSWORD_NEBULOUS, $REPL_DBNAME_NEBULOUS); + showReplicationsStatus($REPL_HOST_PSTAMP, $REPL_USER_PSTAMP, $REPL_PASSWORD_PSTAMP, $REPL_DBNAME_PSTAMP); + echo "
Database replication status (update fix log here)
DatabaseStatus
"; + +echo "
"; menu_end(); @@ -235,9 +200,52 @@ ########################################################################### # +# Creates a postage stamp status table +# +########################################################################### +function createPStampDataTable() { + + $sql = "SELECT label, COUNT(job_id) AS 'Unfinished Jobs', IFNULL(priority,10000) AS priority FROM pstampRequest JOIN pstampJob USING(req_id) LEFT JOIN Label USING(label) WHERE pstampJob.state ='run' and pstampRequest.state ='run' GROUP by label"; + + $pstampdb = DB::connect("mysql://ippuser:ippuser@ippc17/ippRequestServer"); + $qry = $pstampdb->query($sql); + if (dberror($qry)) { + echo "error reading pstamp table
\n"; + echo "
table query : $sql
\n"; + menu_end(); + } + + // set up the table + echo "\n"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + + // list the results + while ($qry->fetchInto($row)) { + + echo ""; + + echo ""; + echo ""; + echo ""; + + echo ""; + } + + echo "
Postage stamp requests
LabelUnfinished jobsPriority
$row[0]$row[1]$row[2]
\n"; + +} + +########################################################################### +# # Creates a table of summitExp against rawExp # ########################################################################### -function createSummitDataTable($gpc1db, $date) { - +function createSummitDataTable($gpc1db) { + + $date = date("Y-m-d"); $sql = "SELECT DISTINCT exp_type FROM summitExp WHERE dateobs > '$date'"; @@ -250,9 +258,11 @@ // set up the table - echo "\n"; - echo "\n"; - write_header_cell ("list", "Exposure type"); - write_header_cell ("list", "At summit"); - write_header_cell ("list", "Registered at MHPCC"); + echo "
\n"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; $msg = "No science images taken since $date"; @@ -268,25 +278,29 @@ $qry2->fetchInto($mhpcc); - $class = "list"; - echo "\n"; - - if ($expType[0] == "OBJECT") { - if ($summit[0] == $mhpcc[0]) { - $msg = "All science exposures taken since $date
have been registered at MHPCC"; - } - else { - $msg = "Warning: Not all science exposures taken since $date
have been registered at MHPCC"; - } + echo ""; + + if ($summit[0] == $mhpcc[0]) { + + if ($expType[0] == "OBJECT") $msg = "All science exposures taken since $date
have been registered at MHPCC"; + $error = 0; } - - write_table_cell ($class, '%s', "", $expType[0]); - write_table_cell ($class, '%d', "", $summit[0]); - write_table_cell ($class, '%d', $link, $mhpcc[0]); - echo "\n"; - } - + else { + if ($expType[0] == "OBJECT") $msg = "Warning: Not all science exposures taken since $date
have been registered at MHPCC"; + $error = 1; + } + + echo ""; + echo ""; + + + + #echo ""; + createFormattedTableCell("", "", $mhpcc[0], $error); + + echo ""; + } + + echo ""; echo "
Status of last night's data
Exposure typeAt summitRegistered at MHPCC
$expType[0]$summit[0]$mhpcc[0]
$msg
\n"; - - echo "

$msg

"; } @@ -331,14 +345,36 @@ $selectedLabel, $selectedStage, $plotType) { - // set up table columns - $class = "list"; - echo "\n"; - echo "\n"; - - echo "

Current labels for $server server (D=distributing, P=publishing)

"; - - write_header_cell($class, ""); - write_header_cell($class, ""); - write_header_cell($class, "Reverts:"); + // setup table + echo "
\n"; + echo "\n"; + echo ""; + echo "\n"; + + echo "\n"; + //echo ""; + echo ""; + echo ""; + foreach ($stages as &$stage) { @@ -357,38 +393,28 @@ if($reverting) {$label = "Stop";$link = $link . "off";} unset($reverting); - write_table_cell($class, '%s', $link, $label); - } - write_header_cell($class, ""); + echo ""; + + } echo "\n"; - echo "\n"; - write_header_cell($class, " "); - write_header_cell($class, "Label (in order of priority)"); + echo "\n"; + //echo ""; + echo ""; foreach ($stages as &$stage) { - if ($stage == $selectedStage) $link = ""; - else $link = + if ($stage == $selectedStage) $showLink = 0; + else $showLink = 1; + $link = "czartool_labels.php?pass=".$pass - ."&proj=".$proj - ."&label=".$selectedLabel - ."&stage=".$stage - ."&plottype=".$plotType; - - write_table_cell($class, '%s', $link, $stage); - } - - if ($selectedStage=="all_stages") $link = ""; - else $link = - "czartool_labels.php?pass=".$pass - ."&proj=".$proj + ."&proj=".$proj ."&label=".$selectedLabel - ."&stage=all_stages" + ."&stage=".$stage ."&plottype=".$plotType; - write_table_cell($class, '%s', $link, "All stages"); - - echo "\n"; - echo "\n"; - + createFormattedTableCell($showLink, $link, $stage, 0); + } + + + // setup default link $defaultlink = "czartool_labels.php?pass=".$pass @@ -415,20 +441,21 @@ } - // create link to label summary page for each label - if ($thisLabel == $selectedLabel) $link = ""; - else $link = - "czartool_labels.php?pass=".$pass - ."&proj=".$proj - ."&label=".$thisLabel - ."&stage=".$selectedStage - ."&plottype=".$plotType; - - echo "\n"; - $distPub = " "; + // show distribution/publishing status + echo "\n"; + $distPub = " "; if ($distributing) $distPub = "D"; if ($publishing) $distPub = $distPub . "P"; - write_table_cell($class, '%s', "", $distPub); - - write_table_cell($class, '%s', $link, $thisLabel); + echo ""; + + // create link to label summary page for each label + if ($thisLabel == $selectedLabel) $showLink = 0; + else $showLink = 1; + $link = + "czartool_labels.php?pass=".$pass + ."&proj=".$proj + ."&label=".$thisLabel + ."&stage=".$selectedStage + ."&plottype=".$plotType; + createFormattedTableCell($showLink, $link, $thisLabel, 0); $str = ""; @@ -437,54 +464,72 @@ $link = $defaultlink; getStateAndFaults($db, $thisLabel, $selectedState, "burntool", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults); $link = "failedChipProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel . "&chipRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "chip", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults); $link = "failedCamProcessedExp.php?pass=" . $pass . "&proj=" . $proj . "&camRun.label=" . $thisLabel . "&camRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "cam", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults); $link = "failedFakeProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&fakeRun.label=" . $thisLabel . "&fakeRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "fake", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults); $link = "failedWarpSkyfiles.php?pass=" . $pass . "&proj=" . $proj . "&warpRun.label=" . $thisLabel . "&warpRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "warp", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults); $link = "failedStackSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&stackRun.label=" . $thisLabel . "&stackRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "stack", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults); $link = "failedDiffSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&diffRun.label=" . $thisLabel . "&diffRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "diff", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults); $link = $defaultlink; getStateAndFaults($db, $thisLabel, $selectedState, "magic", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults); $link = $defaultlink; getStateAndFaults($db, $thisLabel, $selectedState, "magicDS", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults); $link = $defaultlink; getStateAndFaults($db, $thisLabel, $selectedState, "dist", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults); + + $link = "publishDone.php?pass=" . $pass . "&proj=" . $proj . "&publishRun.label=" . $thisLabel . "&publishRun.state=".$searchState; + getStateAndFaults($db, $thisLabel, $selectedState, "pub", $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults); echo "\n"; } - if ($selectedLabel == "all_".$server."_labels") $link = ""; - else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=all_".$server."_labels&stage=".$selectedStage."&plottype=".$plotType; - - echo "\n"; - write_table_cell($class, '%s', "", " "); - write_table_cell($class, '%s', $link, "All $server labels"); + if ($selectedLabel == "all_".$server."_labels") $showLink = 0; + else $showLink = 1; + $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=all_".$server."_labels&stage=".$selectedStage."&plottype=".$plotType; echo "\n"; echo "
"; + + $link = "czartool_labels.php?pass=".$pass + ."&proj=".$proj + ."&label=".$selectedLabel + ."&stage=all_stages" + ."&plottype=".$plotType; + if ($selectedStage != "all_stages") echo ""; + else echo ""; + echo "Plot all stages | "; + $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=all_".$server."_labels&stage=".$selectedStage."&plottype=".$plotType; + echo ""; + else echo ""; + echo "Plot all ".$server."_labels | "; + $plotTypeLink = ($plotType == "linear") ? "log" : "linear"; + $plotTypeText = ($plotType == "linear") ? "Use log plots" : "Use linear plots"; + $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotTypeLink"; + echo "$plotTypeText"; + + + echo "
$server serverReverts:$label
Label (in order of priority)
$distPub
\n"; +} + + +########################################################################### +# +# Creates table cell with a red background if an error +# +########################################################################### +function createFormattedTableCell($showLink, $link, $str, $error) { + + $fontColor = $error ? "black" : "blue"; + + if ($error) echo ""; + else echo ""; + if ($showLink) echo "$str"; + else if ($str) echo "$str"; + else echo " "; } @@ -594,9 +639,10 @@ function createDatesTable($db) { - $class = "list"; - echo "\n"; - echo "\n"; - write_header_cell($class, "Server"); - write_header_cell($class, "Dates"); + echo "
\n"; + echo "\n"; + echo ""; + echo "\n"; + echo ""; + echo ""; echo "\n"; @@ -632,50 +678,54 @@ } - $class = "list"; - echo "\n"; - write_table_cell($class, '%s', "", $server); - write_table_cell($class, '%s', "", $dates); + echo ""; + echo ""; + echo ""; + echo ""; + +} + +########################################################################### +# +# Checks the status of all the pantasks servers +# +########################################################################### +function createServersTable($pass, $proj, $db, $servers, $selectedLabel, $selectedStage, $plotType) { + + // set up table columns + echo "
Current dates for selected pantasks servers
ServerDates
$server$dates
\n"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + + //write_header_cell($class, "Server"); + //write_header_cell($class, "Alive?"); + //$link = "czartool_labels.php?pass=".$pass + // ."&proj=".$proj + // ."&label=".$selectedLabel + // ."&stage=".$selectedStage + // ."&plottype=".$plotType + // ."&allservercmd=stop"; + + //$link = ""; # TODO removed links temporarily + // write_table_cell($class, '%s', $link, "Stop all"); + //$link = "czartool_labels.php?pass=".$pass + // ."&proj=".$proj + // ."&label=".$selectedLabel + // ."&stage=".$selectedStage + // ."&plottype=".$plotType + // ."&allservercmd=run"; + + //$link = ""; # TODO removed links temporarily + // write_table_cell($class, '%s', $link, "Run all"); echo "\n"; -} - -########################################################################### -# -# Checks the status of all the pantasks servers -# -########################################################################### -function createServersTable($pass, $proj, $db, $servers, $selectedLabel, $selectedStage, $plotType) { - - // set up table columns - $class = "list"; - echo "
Pantasks server status
ServerAlive?Running?
\n"; - echo "\n"; - write_header_cell($class, "Server"); - write_header_cell($class, "Alive?"); - $link = "czartool_labels.php?pass=".$pass - ."&proj=".$proj - ."&label=".$selectedLabel - ."&stage=".$selectedStage - ."&plottype=".$plotType - ."&allservercmd=stop"; - - $link = ""; # TODO removed links temporarily - write_table_cell($class, '%s', $link, "Stop all"); - $link = "czartool_labels.php?pass=".$pass - ."&proj=".$proj - ."&label=".$selectedLabel - ."&stage=".$selectedStage - ."&plottype=".$plotType - ."&allservercmd=run"; - - $link = ""; # TODO removed links temporarily - write_table_cell($class, '%s', $link, "Run all"); - echo "\n"; - foreach ($servers as &$server) { getServerStatus($db, $server, $alive, $running); - echo "\n"; + echo "\n"; $link = "czartool_labels.php?pass=".$pass ."&proj=".$proj @@ -686,37 +736,41 @@ #$link = ""; # TODO removed links temporarily - write_table_cell($class, '%s', $link, $server); - write_table_cell($class, '%s', "", $alive ? "yes" : "NO"); - - if ($alive) { - - $link = "czartool_labels.php?pass=".$pass - ."&proj=".$proj - ."&label=".$selectedLabel - ."&stage=".$selectedStage - ."&plottype=".$plotType - ."&server=".$server - ."&servercmd="; - - if ($running) { - - $link = $link . "stop"; - $link = ""; # TODO removed links temporarily - write_table_cell($class, '%s', $link, "stop"); - write_table_cell($class, '%s', "", ""); - } - else { - - $link = $link . "run"; - write_table_cell($class, '%s', "", ""); - $link = ""; # TODO removed links temporarily - write_table_cell($class, '%s', $link, "run"); - } - } - else { - - write_table_cell($class, '%s', "", ""); - write_table_cell($class, '%s', "", ""); - } + //write_table_cell($class, '%s', $link, $server); + //write_table_cell($class, '%s', "", $alive ? "yes" : "NO"); + //echo ""; + createFormattedTableCell(1, $link, $server, 0); + createFormattedTableCell(0, "", $alive ? "yes" : "NO", !$alive); + createFormattedTableCell(0, "", $running ? "yes" : "NO", !$running); + + //if ($alive) { + + // $link = "czartool_labels.php?pass=".$pass + // ."&proj=".$proj + // ."&label=".$selectedLabel + // ."&stage=".$selectedStage + // ."&plottype=".$plotType + // ."&server=".$server + // ."&servercmd="; + + //if ($running) { + + // $link = $link . "stop"; + // $link = ""; # TODO removed links temporarily + // write_table_cell($class, '%s', $link, "stop"); + // write_table_cell($class, '%s', "", ""); + // } + // else { + + // $link = $link . "run"; + // write_table_cell($class, '%s', "", ""); + // $link = ""; # TODO removed links temporarily + // write_table_cell($class, '%s', $link, "run"); + // } + // } + // else { + + // write_table_cell($class, '%s', "", ""); + // write_table_cell($class, '%s', "", ""); + // } echo "\n"; } @@ -822,5 +876,9 @@ $dbRepl = DB::connect("mysql://$replUser:$replPassword@$replHost"); if (PEAR::isError($dbRepl)) { - die("MySQL DB connection error: Check the configuration for $replDatabaseName"); + echo ""; + //die("MySQL DB connection error: Check the configuration for $replDatabaseName"); + die(""); + return; + } $res = $dbRepl->query('SHOW SLAVE STATUS'); Index: branches/eam_branches/ipp-20110213/ippMonitor/raw/site.php.in =================================================================== --- branches/eam_branches/ipp-20110213/ippMonitor/raw/site.php.in (revision 30812) +++ branches/eam_branches/ipp-20110213/ippMonitor/raw/site.php.in (revision 31083) @@ -25,5 +25,5 @@ $REPL_USER_GPC1 = "ipp"; $REPL_PASSWORD_GPC1 = "ipp"; -$REPL_DBNAME_GPC1 = "gpc1"; +$REPL_DBNAME_GPC1 = "ippadmin"; $REPL_HOST_NEBULOUS = "ippdb02.IfA.Hawaii.Edu";
$server
$replDatabaseNameMySQL DB connection error - check configuration