Changeset 29190

Timestamp:

2014-08-14T14:54:59+12:00 (10 years ago)

Author:

ak19

Message:

Suppressing the ping collection 'did not succeed' message in silent mode. Using silent mode when the collection's been deactivated and we expect pinging a collection to return false.

File:

• main/trunk/greenstone2/bin/script/activate.pl (modified) (7 diffs)

main/trunk/greenstone2/bin/script/activate.pl

@@ -143 +143 @@
 # and is-persistent (is-persistent only implemented for GS2).
 sub config {
-    my ($library_url, $command, $check_message_against_regex, $site, $expected_error_code) = @_; 
+    my ($library_url, $command, $check_message_against_regex, $site, $expected_error_code, $silent) = @_; 
             # Gatherer.java's configGS3Server doesn't use the site variable
             # so we don't have to either
@@ -177 +177 @@
                 return 1;
             } else {
+                # if we expect the collection to be inactive, then we'd be in silent mode: if so,
+                # don't print out the "ping did not succeed" response, but print out any other messages
+
+                # So we only suppress the ping col "did not succeed" response if we're in silent mode
+                # But if any message other than ping "did not succeed" is returned, we always print it
+                if($response_content !~ m/did not succeed/ || !$silent) {
                 &print_msg("\n\tBUT: command $library_url$command response UNEXPECTED.\n", 3);
                 &print_msg("*** Got message:\n$response_content.\n", 4);
-                return 0; # ping on a collection may "not succeed."
+                }
+                return 0; # ping on a collection may "not succeed."
             }
         } 
@@ -231 +238 @@
 
 sub ping {
-    my ($library_url, $command, $gs_mode, $site) = @_;
+    my ($library_url, $command, $gs_mode, $site, $silent) = @_;
 
     # If the GS server is not running, we *expect* to see a "500" status code.
@@ -239 +246 @@
     my $check_responsemsg_against_regex = q/(succeeded)/;
     my $expected_error_code = 500;
-    return config($library_url, $command, $check_responsemsg_against_regex, $site, $expected_error_code);
+    return config($library_url, $command, $check_responsemsg_against_regex, $site, $expected_error_code, $silent);
 }
 
@@ -259 +266 @@
 # send a pingaction to a collection in GS library to check if it's active
 sub ping_library_collection {
-    my ($library_url, $gs_mode, $qualified_collection, $site) = @_;
+    my ($library_url, $gs_mode, $qualified_collection, $site, $silent) = @_;
     
     my $command = "";
@@ -268 +275 @@
         $command = "?a=s&sa=ping&st=collection&sn=$qualified_collection";       
     }
-    return &ping($library_url, $command, $gs_mode, $site);
+    return &ping($library_url, $command, $gs_mode, $site, $silent);
 }
 
@@ -764 +771 @@
 
                     &print_msg("Checking if the collection $qualified_collection is not already active\n");
-                    my $collection_active = &ping_library_collection($library_url, $gs_mode, $qualified_collection, $site);
+
+                    # Since we could have deactivated the collection at this point,
+                    # it is likely that it is not yet active. When pinging the collection
+                    # a "ping did not succeed" message is expected, therefore tell the ping
+                    # to proceed silently
+                    my $silent = 1;
+                    my $collection_active = &ping_library_collection($library_url, $gs_mode, $qualified_collection, $site, $silent);
 
                     if (!$collection_active) {
+                    &print_msg(" Collection is not active.\n");
                     &print_msg("Activating collection $qualified_collection\n");
                     &activate_collection($library_url, $gs_mode, $qualified_collection, $site);
                     
                     # unless an error occurred, the collection should now be active:
-                    $collection_active = &ping_library_collection($library_url, $gs_mode, $qualified_collection, $site);
+                    $collection_active = &ping_library_collection($library_url, $gs_mode, $qualified_collection, $site); # not silent if ping did not succeed
                     if(!$collection_active) {
                         &print_msg("ERROR: collection $qualified_collection did not get activated\n");