Changeset 27399 for gs2-extensions/tdb-edit

Timestamp:

2013-05-23T13:39:24+12:00 (11 years ago)

Author:

jmt12

Message:

Try to make waiting messages a little more meaningful. Also pass a flag through to the first client to let it know it is first and the server may still be starting up

File:

• gs2-extensions/tdb-edit/trunk/src/perllib/dbutil/tdbserver.pm (modified) (6 diffs)

gs2-extensions/tdb-edit/trunk/src/perllib/dbutil/tdbserver.pm

@@ -67 +67 @@
   }
 
+  my $we_started_server = 0;
   my $server_lockfile_path =  &util::filename_cat($ENV{'GSDLHOME'},'collect',$collection,'tmp','tdbserver.lock');
   print " * Searching for TDBServer lockfile...\n";
@@ -81 +82 @@
     if (!-e $server_lockfile_path)
     {
+      $we_started_server = 1;
       # ...start it!
       my $launch_cmd = 'TDBServer.pl "' . $$ . '" "' . $collection . '"';
@@ -90 +92 @@
       my $line = '';
       my $server_lock_file_created = 0;
+      autoflush STDOUT 1;
+      print "* Waiting for TDBServer to start";
       my $server_host = '';
       my $server_port = '';
       while ($line = <SERVERIN>)
       {
+        print ".";
         # - watch for the line indicating a lock file has been created and
         #   populated with a sexy port number
@@ -115 +120 @@
       }
       close(SERVERIN);
+      print "\n";
       if (!$server_lock_file_created)
       {
@@ -136 +142 @@
   # record this for later
   $listener_server_lockfile_paths{$server_lockfile_path} = $infodb_file_path;
-  return TDBClient->new($server_lockfile_path, $infodb_file);
+  return TDBClient->new($server_lockfile_path, $infodb_file, $we_started_server);
 }
 
@@ -162 +168 @@
   # we should now wait until all of our server_lockfiles have actually been
   # removed (otherwise people could mistakenly run import/build again
-  # immediately and things *might* go pearshaped).
-  # - actually, if they try to run again while TDB is still running, it will
-  #   detect an existing lockfile and immediately quit. So maybe waiting
-  #   isn't as important as I originally thought. I'll comment it out for now.
-#  foreach my $server_lockfile_path (keys (%created_server_lockfile_paths))
-#  {
-#    # While the file exists, we should wait
-#    print "* Waiting for TDBServer [" . $server_lockfile_path . "] to exit...";
-#    if (-e $server_lockfile_path)
-#    {
-#      while (-e $server_lockfile_path)
-#      {
-#        print ".";
-#        sleep(1);
-#      }
-#    }
-#    print " Done!\n";
-#  }
+  # immediately and things *might* go pearshaped). (Subsequent testing shows it
+  # won't - a new Greenstone build can't start until the previous lockfile is
+  # removed - but I think, for ATOMic sake, I may as well make waiting a part
+  # of the Greenstone import/build time.
+  my $wait_for_exit = 1;
+  foreach my $server_lockfile_path (keys (%created_server_lockfile_paths))
+  {
+    if ($wait_for_exit)
+    {
+      # While the file exists, we should wait
+      autoflush STDOUT 1;
+      print "* Waiting for TDBServer to exit [" . $server_lockfile_path . "]";
+      if (-e $server_lockfile_path)
+      {
+        while (-e $server_lockfile_path)
+        {
+          print ".";
+          sleep(1);
+        }
+      }
+    }
+    else
+    {
+      print "* NOT Waiting for TDBServer to exit... ";
+    }
+    print " Done!\n";
+  }
 }