Changeset 43027

Timestamp:

May 19, 2026, 5:16:49 PM (2 months ago)

Author:

eugene

Message:

newer apache no longer allows us to modify the environment, need to pass things like NEB_SERVER via the command line

Location:

branches/eam_branches/ipp-pstamp-20260421/ippMonitor/raw

Files:

• getimage.php (modified) (1 diff)
• ipp.php (modified) (3 diffs)

branches/eam_branches/ipp-pstamp-20260421/ippMonitor/raw/getimage.php

@@ -96 +96 @@
 /* --site=$SITE */
 $output = array();
-exec ("ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id 2> /tmp/errors", $output, $status);
+
+# apache no longer updates env, need to supply these on the command line
+$myCommand = "perl -I$PERLLIB -I$PERLLIB/perl5 -I$PERLLIB/perl5/site_perl $BINDIR/ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id --neb-server $NEB_SERVER";
+exec ($myCommand, $output, $status);
+
+# exec ("ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id 2> /tmp/errors", $output, $status);
 
 # use these to check the environment

branches/eam_branches/ipp-pstamp-20260421/ippMonitor/raw/ipp.php

@@ -865 +865 @@
     global $WWWBIN;
     global $SITE;
-    putenv("PERL5LIB=$PERLLIB:");
-
-    $PATH = getenv("PATH");
-    putenv("PATH=$WWWBIN:$BINDIR:$PATH");
-    putenv("NEB_SERVER=$NEB_SERVER");
-
-    exec ("ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id", $output, $status);
+
+    # newer versions of apache do not allow the environment to change
+    # these elements need to be supplied on the command line below
+    # $PATH = getenv("PATH");
+    # putenv("PATH=$WWWBIN:$BINDIR:$PATH");
+    # putenv("NEB_SERVER=$NEB_SERVER");
+    # putenv("PERL5LIB=$PERLLIB:");
+
+    $myCommand = "perl -I$PERLLIB -I$PERLLIB/perl5 -I$PERLLIB/perl5/site_perl $BINDIR/ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id --neb-server $NEB_SERVER";
+    exec ($myCommand, $output, $status);
 
     if (0) {
@@ -877 +880 @@
       echo "NEB_SERVER: $NEB_SERVER<br>";
       echo "basename: $basename<br>";
+      echo "myCommand: $myCommand<br>";
       for ($i = 0; $i < count($output); $i++) {
         echo "output $i: $output[$i]<br>";
@@ -891 +895 @@
       if ($status == 1) {       
         echo "<b>log file ($filerule, $basename) not found<br></b>\n";
-        echo "ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id<br>";
+        echo "$BINDIR/ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id<br>";
         return;
       } else {
         echo "<b>ipp_filename.pl failure, check configuration<br></b>\n";
-        echo "ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id<br>";
+        echo "$BINDIR/ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id<br>";
         echo "NEB_SERVER: $NEB_SERVER<br>";
         return;