Changeset 30533 for main/trunk/greenstone2/perllib

Timestamp:

2016-05-12T21:52:42+12:00 (8 years ago)

Author:

ak19

Message:

Adjustments for Windows OS to servercontrol.pm::config() which now uses wget.

File:

• main/trunk/greenstone2/perllib/servercontrol.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -154 +154 @@
     foreach my $line (@lines) {
         #print STDERR "@@@@ LINE: $line\n";
-        if($line =~ m@failed: Connection timed out.$@) {
+        if($line =~ m@failed: Connection timed out.$@) { # linux
         $response_code = "failed: Connection timed out.";
+        last; # break keyword in perl = last
+        }
+        elsif($line =~ m@Giving up.$@) { # windows (unless -T 5 -t 1 is not passed in)
+        $response_code = "failed: Giving up.";
         last; # break keyword in perl = last
         }
@@ -169 +173 @@
     }
 
-    if($command =~ m@ping@ && $response_code =~ m@failed: Connection refused@) {
+    if($command =~ m@ping@ && $response_code =~ m@failed: (Connection refused|Giving up)@) {
         # server not running
         $self->print_msg("*** Server not running. $library_url$command\n", 3);