Changeset 16395

Timestamp:

2008-07-14T15:21:19+12:00 (15 years ago)

Author:

ak19

Message:

1. For Fedora CATALINA_HOME ought to be its own tomcat, but When Greenstone 3 is remote (but not when it's local, for some reason) CATALINA_HOME is set to GS3's tomcat. This causes the fedora restart to fail after gsdl.xml was created. 2. Other fixes.

File:

• gsdl/trunk/perllib/g2futil.pm (modified) (6 diffs)

gsdl/trunk/perllib/g2futil.pm

@@ -290 +290 @@
 
     print STDERR "Ensuring that a correct gsdl.xml file exists on the Fedora server end\n";
-    # The top of this file has already made sure that FEDORA_HOME is set
+    # The top of this file has already made sure that FEDORA_HOME is set, but for GS3
+    # CATALINA_HOME is set to GS' own tomcat. Since we'll be working with fedora, we need
+    # to temporarily set CATALINA_HOME to fedora's tomcat:
+    my $gs_catalina_home = $ENV{'CATALINA_HOME'};
+    $ENV{'CATALINA_HOME'} = &util::filename_cat($ENV{'FEDORA_HOME'}, "tomcat");
 
     # 1. Find out which folder to write to: fedora_host or localhost 
@@ -305 +309 @@
     if(!-e $xmlFile) {
         # try putting gsdl in this folder, but still print a warning
-        print STDERR "**** $host_path does not contain file fedora.xml. Hoping gsdl.xml belongs there anyway\n";
+        print STDERR "$host_path does not contain file fedora.xml. Hoping gsdl.xml belongs there anyway\n";
     }
     }
@@ -347 +351 @@
     my $stop_tomcat = &util::filename_cat($fedora_home, "tomcat", "bin", "shutdown".$script_ext);
     # execute the command 
-    $!=0; # does this initialise the return value?
+    $! = 0; # does this initialise the return value?
     my $status = system($stop_tomcat);
     if ($status!=0) { # to get the actual exit value, divide by 256, but not useful here
@@ -365 +369 @@
     # c. Restart the fedora server
     my $start_tomcat = &util::filename_cat($fedora_home, "tomcat", "bin", "startup".$script_ext);
-    $!=0;
+    $! = 0;
     $status = system($start_tomcat);
     if ($status!=0) { 
@@ -371 +375 @@
     print "Exit status = ", $status/256, "\n";
     }
-   
+
+    # reset CATALINA_HOME to GS' Tomcat:
+    $ENV{'CATALINA_HOME'} = $gs_catalina_home;
     
     # Starting up the Fedora server takes a long time. We need to wait for the server to be
@@ -390 +396 @@
 
     print STDERR "Fedora server restarted. Waiting for it to become ready...\n";
-    
-    # print STDERR "****$protocol://$hostname:$port/fedora/search\n";
+    #print STDERR "****$protocol://$hostname:$port/fedora/search\n";
+    
+    $! = 0;
     my $fedoraServerReady = system("wget -q --spider --waitretry=3 --tries=20 $protocol://$hostname:$port/fedora/search"); 
     if($fedoraServerReady != 0) {
     print STDERR "Fedora server is still not ready... ERROR: $!\n";
-    print "Exit status = ", $status/256, "\n";
+    print "Exit status = ", $fedoraServerReady/256, "\n";
     die "Exiting....\n";
     }
-    
+
     # return some indication that things went well
     return "gsdl.xml";