Changeset 28765

Timestamp:

2013-12-18T10:17:20+13:00 (10 years ago)

Author:

jmt12

Message:

Making the waiting for TDBServer exit a little more finegrained - i.e. 1/100th of a second rather than 1 second

File:

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

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

@@ -29 +29 @@
 package dbutil::tdbserver;
 
+# Pragma
 use strict;
 use warnings;
 
-# We're going to have to delve into locking (a little) to prevent multiple
-# threads trying to launch the server at once
+# Modules
+# - we're going to have to delve into locking (a little) to prevent
+#   multiple threads trying to launch the server at once
 use Fcntl qw(:flock);
-
+# - we'll also need to wait around for an indeterminate amount of time for the
+#   TDBServer to exit (detected by its lockfile disappearing)
+use Time::HiRes  qw( usleep );
+
+# Greenstone modules
 use TDBClient;
 use util;
@@ -184 +190 @@
         $blurb = '[' . $server_lockfile_path . ']';
       }
-      print '* Waiting for TDBServer to exit';
+      print '* Waiting for TDBServer to exit... ';
       if (-e $server_lockfile_path)
       {
         while (-e $server_lockfile_path)
         {
-          print '.';
-          sleep(1);
+          usleep(10000);
         }
       }