Changeset 28088

Timestamp:

2013-08-19T23:36:12+12:00 (11 years ago)

Author:

davidb

Message:

Additional print messages added to show the decision making process activate.pl goes through

File:

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

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

@@ -192 +192 @@
             return 0; # return false, since the response_code was an error, expected or not
         }
+        else {
+            &print_msg("*** Command $library_url$command\n");
+            &print_msg("*** Unexpected error. HTTP Response Status: $response_code - Failed.\n");
+            return 0;
+        }
     }   
 }
@@ -621 +626 @@
    
         &print_msg("Pinging $library_url\n");       
-        if(&ping_library($library_url, $gs_mode, $site)) { # server running
+        if (&ping_library($library_url, $gs_mode, $site)) { # server running
         
             # server is running, so release the collection if 
@@ -628 +633 @@
             $is_persistent_server = &is_persistent($library_url, $gs_mode);         
             
-            if($is_persistent_server) { # only makes sense to issue activate and deactivate cmds to a persistent server
+            if ($is_persistent_server) { # only makes sense to issue activate and deactivate cmds to a persistent server
                 
                 &print_msg("Checking if the collection $qualified_collection is already active\n");
                 my $collection_active = &ping_library_collection($library_url, $gs_mode, $qualified_collection, $site);
 
-                if($collection_active) {
+                if ($collection_active) {
                 &print_msg("De-activating collection $qualified_collection\n");
                 &deactivate_collection($library_url, $gs_mode, $qualified_collection, $site);
                 }
-            }   
-        }
+                else {
+                &print_msg("Collection is not active => No need to deactivate\n");
+                }
+            }
+            else {
+                &print_msg("Server is not persistent => No need to deactivate collection\n");
+            }
+        }
+        else {
+            &print_msg("No response to Ping => Taken to mean server is not running\n");
+        }
+
     }
     
@@ -737 +752 @@
         
             &print_msg("Pinging $library_url\n");
-            if(&ping_library($library_url, $gs_mode, $site)) { # server running
+            if (&ping_library($library_url, $gs_mode, $site)) { # server running
             
                 # don't need to work out persistency of server more than once, since the libraryURL hasn't changed              
-                if(!defined $is_persistent_server) {
+                if (!defined $is_persistent_server) {
                     &print_msg("Checking if Greenstone server is persistent\n");
                     $is_persistent_server = &is_persistent($library_url, $gs_mode);
@@ -746 +761 @@
                 
                     
-                if($is_persistent_server) { # persistent server, so can try activating collection
+                if ($is_persistent_server) { # persistent server, so can try activating collection
 
                     &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);
 
-                    if(!$collection_active) {
+                    if (!$collection_active) {
                     &print_msg("Activating collection $qualified_collection\n");
                     &activate_collection($library_url, $gs_mode, $qualified_collection, $site);
@@ -761 +776 @@
                     }
                     }
+                    else {
+                    &print_msg("Collection is not active => No need to deactivate\n");
+                    }
                 }
+                else {
+                    &print_msg("Server is not persistent => No need to deactivate collection\n");
+                }
+            }
+            else {
+                &print_msg("No response to Ping => Taken to mean server is not running\n");
             }
         }