Changeset 34735 for branches/eam_branches/ipp-20120905/ippMonitor

Timestamp:

Nov 29, 2012, 2:15:01 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippMonitor/INSTALL (modified) (1 diff)
• ippMonitor/Makefile.in (modified) (1 diff)
• ippMonitor/def/failedStaticsky.d (copied) (copied from trunk/ippMonitor/def/failedStaticsky.d )
• ippMonitor/def/staticsky_failure.d (copied) (copied from trunk/ippMonitor/def/staticsky_failure.d )
• ippMonitor/raw/czartool_labels.php (modified) (1 diff)
• ippMonitor/raw/ipp.php (modified) (3 diffs)
• ippMonitor/raw/ipp.stack.dat (modified) (1 diff)
• ippMonitor/raw/site.php.in (modified) (1 diff)

branches/eam_branches/ipp-20120905/ippMonitor/INSTALL

@@ -24 +24 @@
 # Note: we use a 'science databases (replication) slave' and the ippMonitor read-only account to connect to that database
 psconfigure --dbhost scidbs1 --dbuser ippMonitor --dbpass ippMonitor --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config
+
+psconfigure --dbhost scidbm --dbuser ipp --dbpass ipp --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config
+

branches/eam_branches/ipp-20120905/ippMonitor/Makefile.in

@@ -240 +240 @@
 $(DESTWWW)/lapRuns.php \
 $(DESTWWW)/lapExposures.php \
-$(DESTWWW)/lapStacks.php
+$(DESTWWW)/lapStacks.php \
+$(DESTWWW)/failedStaticsky.php \
+$(DESTWWW)/staticsky_failure.php
 
 PICTURES = \

branches/eam_branches/ipp-20120905/ippMonitor/raw/czartool_labels.php

@@ -465 +465 @@
         createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
 
-        $link = $defaultlink;
+        $link = "failedStaticsky.php?pass=" . $pass . "&proj=" . $proj . "&staticskyRun.label=" . $thisLabel . "&staticskyRun.state=".$searchState;
         getStateAndFaults($db, $thisLabel, $selectedState, "staticsky", $str, $anyFaults);
         createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);

branches/eam_branches/ipp-20120905/ippMonitor/raw/ipp.php

@@ -799 +799 @@
   // echo "<b>class_id: $class_id</b><br>\n";
   // echo "<b>camera:   $camera</b><br>\n";
+  // echo "<b>filerule:   $filerule</b><br>\n";
 
   if (! $class_id) { $class_id = "NONE"; }
 
+  //SCH: I set a default value for the 'camera' which is based on the
+  //'proj' parameter.
+  //It's necessary for staticsky logs and it would require to join tables
+  //back to the warpRun table
+  if (! $camera) { $camera = strtoupper($_GET['proj']); }
+
   if ($basename && $camera && $filerule) {
-
     // do I need to do this to the output result as well?
     $basename = escapeshellarg($basename);
@@ -841 +847 @@
       return;
     }
+    echo "<b>log filename: $filename</b><br>\n";
 
     echo "<pre>\n";
@@ -850 +857 @@
   }
 }
+
 
 // expect image supplied with key=name

branches/eam_branches/ipp-20120905/ippMonitor/raw/ipp.stack.dat

@@ -36 +36 @@
 menulink  | menuselect   | link    | Static Sky Processed Skyfile | staticskyProcessedSkyfile.php
 menulink  | menuselect   | link    | Static Sky Failed Skyfile    | staticskyFailedSkyfile.php
+menulink  | menuselect   | link    | Static Sky Failed            | failedStaticsky.php

branches/eam_branches/ipp-20120905/ippMonitor/raw/site.php.in

@@ -47 +47 @@
 $REPL_DBNAME_ISP = "ippc17 (isp)";
 
-$REPL_HOST_NEBULOUS_SECONDARY = "ippc63.IfA.Hawaii.Edu";
+$REPL_HOST_NEBULOUS_SECONDARY = "ippdb04.IfA.Hawaii.Edu";
 $REPL_USER_NEBULOUS_SECONDARY = "ippMonitor";
 $REPL_PASSWORD_NEBULOUS_SECONDARY = "ippMonitor";
-$REPL_DBNAME_NEBULOUS_SECONDARY = "ippc63 (secondary nebulous / 50,000 sec behind is acceptable)";
+$REPL_DBNAME_NEBULOUS_SECONDARY = "ippdb04 (secondary nebulous / 50,000 sec behind is acceptable / usually stopped on Mondays and Tuesdays)";
+
+$REPL_HOST_NEBULOUS_TERNARY = "ippc63.IfA.Hawaii.Edu";
+$REPL_USER_NEBULOUS_TERNARY = "ippMonitor";
+$REPL_PASSWORD_NEBULOUS_TERNARY = "ippMonitor";
+$REPL_DBNAME_NEBULOUS_TERNARY = "ippc63 (secondary nebulous / 50,000 sec behind is acceptable / usually stopped on Mondays and Tuesdays)";