Changeset 33315 for gs3-extensions

Timestamp:

2019-07-09T16:54:05+12:00 (5 years ago)

Author:

ak19

Message:

1. Bugfix to issue discovered on windows: when the GS3 server isn't running, and therefore the solr servlet isn't available either, wget testing the solr servlet URL on Windows returned 'failed: Bad file descriptor' msg, which wasn't one of the cases that the solrserver.pm was monitoring for and responding to. It only looked for 'ERROR ' and 'failed: Connection refused' messages. Added in a check for the bad file descriptor message, but also for any 'failed:' (case insensitive) messages in general, in case in other situations or on other OS we get a slightly different message. 2. When the server isn't running, this is not a fatal error as the solrserver will simply manually start tomcat to process the solr collection. So in such a case we don't want to print something as drastic as WGET_SERVICE got an error, as we hadn't been doing before. Instead on the 'failed:' messages, it prints the message and then adds that this probably means the GS3 server isn't running.

File:

• gs3-extensions/solr/trunk/src/perllib/solrserver.pm (modified) (5 diffs)

gs3-extensions/solr/trunk/src/perllib/solrserver.pm

@@ -87 +87 @@
     my $xml_output = "";
     my $error_output = undef;
+    my $is_error = 0;
 
     my $in_preamble = ($output_format eq "xml") ? 1 : 0;
@@ -92 +93 @@
 ##    print STDERR "**** wgetcmd = \n $cmd\n";
 
-    if (open(WIN,"$cmd |")) {
+    if (open(WIN,"$cmd |")) {
 
     my $line;
@@ -100 +101 @@
         chomp $line;
         $error_output = $line;
+        $is_error = 1;
         last;
         }
-        elsif ($line =~ m/failed: Connection refused/) {
+        elsif ($line =~ m/failed: (Connection refused|Bad file descriptor)/ || $line =~ m/failed:/i) {
+                    # When the server wasn't running on windows, also got "failed: Bad file descriptor".
+                    # But making more robust by adding support for any "failed:..." wget response msg
         chomp $line;
         $error_output = $line;
@@ -129 +133 @@
 
     if(defined $error_output) {
-    print STDERR "\n\n**** WGET_SERVICE got an error: $error_output\n\n";
+        if($is_error) {
+            print STDERR "\n\n**** WGET_SERVICE got an error: $error_output\n\n";
+        } else {
+            print STDERR "\n\n**** WGET_SERVICE got: $error_output. (GS3 server likely not running.)\n\n";
+        }
     }
 
@@ -416 +424 @@
 
     my $server_status = "unknown";
-
     if ($self->server_running()) {
+
     $server_status = "already-running";
     print STDERR "@@@@ server already running\n\n";