Changeset 26989 for gs2-extensions

Timestamp:

2013-03-05T10:27:01+13:00 (11 years ago)

Author:

jmt12

Message:

Hostname is now automatically determined when the script is run - rather than being read in from a config file (which, co-incidently I forgot to update when I moved from Karearea, and spent a while tracking down why TDBServer wasn't starting up properly

File:

• gs2-extensions/tdb-edit/trunk/src/bin/script/TDBServer.pl (modified) (5 diffs)

gs2-extensions/tdb-edit/trunk/src/bin/script/TDBServer.pl

@@ -49 +49 @@
   $revision += 0;
   # - and add to Perl's path
+  unshift (@INC, $ENV{'GEXTTDBEDIT_INSTALLED'} . '/lib/perl5/site_perl/' . $major . '.' . $minor . '.' . $revision);
   unshift (@INC, $ENV{'GEXTTDBEDIT_INSTALLED'} . '/share/perl/' . $major . '.' . $minor . '.' . $revision);
 }
@@ -82 +83 @@
 my $collection = '';
 my $no_daemon = 0;
-my $debug = 0;
+my $debug = 1;
 my $server;
-my $server_host;
+my $machine_name = `hostname -s`;
+chomp($machine_name);
+my $server_host = $machine_name . '.local';
 my $server_port;
 my $server_threads;
@@ -138 +141 @@
       my $key = $1;
       my $value = $2;
+      # Allow the override of serverhost
       if ($key eq "serverhost")
       {
@@ -216 +220 @@
   if ($pid == 0)
   {
+    print STDERR "[" . time() . ":" . $server_host . ":" . $server_port . "]\n";
+    print " * Starting server on " . $server_host . ":" . $server_port . "\n";
     # - create server object
-    print " * Creating pool of " . $server_threads . " threads listening on socket: " . $server_host . ":" . $server_port . "\n";
+    print " * Creating pool of " . $server_threads . " threads listening on socket\n";
     $server = SocketsSwimmingThreadPoolServer->new(host=>$server_host,
                                                    port=>$server_port,
@@ -494 +500 @@
       }
       &debugPrint($the_count, $tid, $command_name, 'Command: ' . $command1) unless !$debug;
-      $result = `$command1`;
+      if (-e $tdb_path)
+      {
+        $result = `$command1`;
+      }
+      else
+      {
+        &debugPrint("TDB database doesn't exist (yet): " . $tdb_path);
+        $result = '';
+      }
       &debugPrint($the_count, $tid, $command_name, 'Result: ' . $result) unless !$debug;
-      if ($result =~ /-{70}/)
+      if ($result !~ /-{70}/)
       {
         $result .= "-"x70 . "\n";