Changeset 27425 for gs2-extensions/tdb-edit

Timestamp:

2013-05-24T09:40:52+12:00 (11 years ago)

Author:

jmt12

Message:

Tidying up debug comments and processing comments

File:

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

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

@@ -69 +69 @@
   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";
+  print " * Searching for TDBServer lockfile...\n" if ($debug);
   if (!-e $server_lockfile_path)
   {
-    print "Not found.\n";
+    print "Not found.\n" if ($debug);
     # We need to lock here to ensure only one thread enters the following code,
     # sees a missing TDBServer, and launches it
@@ -85 +85 @@
       # ...start it!
       my $launch_cmd = 'TDBServer.pl "' . $$ . '" "' . $collection . '"';
-      print "* Starting TDBServer for: " . $collection . " [" . $launch_cmd . "]... ";
+      print "* Starting TDBServer for: " . $collection . " [" . $launch_cmd . "]...\n";
       # @note I once had the below pipe ending with 2>&1 |, but that then blocks
       #       indefinitely when looping and reading <SERVERIN>.
@@ -125 +125 @@
         die("Error! TDBServer failed to create lock file. Check server logs.");
       }
-      else
-      {
-        print "Running on " . $server_host . ":" . $server_port . "\n";
+      elsif ($debug)
+      {
+        print "* Server now running on " . $server_host . ":" . $server_port . "\n";
       }
       # record this for later
@@ -138 +138 @@
   else
   {
-    print "Found!\n";
+    print "Found!\n" if ($debug);
   }
   # record this for later
@@ -179 +179 @@
       # While the file exists, we should wait
       autoflush STDOUT 1;
-      print "* Waiting for TDBServer to exit [" . $server_lockfile_path . "]";
+      my $blurb = '';
+      if ($debug)
+      {
+        $blurb = '[' . $server_lockfile_path . ']';
+      }
+      print '* Waiting for TDBServer to exit';
       if (-e $server_lockfile_path)
       {
         while (-e $server_lockfile_path)
         {
-          print ".";
+          print '.';
           sleep(1);
         }
@@ -191 +196 @@
     else
     {
-      print "* NOT Waiting for TDBServer to exit... ";
+      print '* NOT Waiting for TDBServer to exit... ';
     }
     print " Done!\n";