Changeset 27397

Timestamp:

2013-05-23T13:09:48+12:00 (11 years ago)

Author:

jmt12

Message:

Allowing server out and err streams to be redirected to dev null

File:

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

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

@@ -59 +59 @@
 # We need to do a little file locking
 use Fcntl qw(:flock); #import LOCK_* constants
-
 # Advanced child process control allowing bidirectional pipes
 use IPC::Run qw(harness start pump finish);
-
 # we need to run as a daemon
 use Proc::Daemon;
+# Try and find the hostname
+use Sys::Hostname;
 
 # The server will need to accept requests from multiple threads, and
@@ -87 +87 @@
 my $debug = 1;
 my $server;
-my $machine_name = `hostname -s`;
+my $machine_name = (`hostname -s` || `hostname -a` || `hostname` || $ENV{'HOSTNAME'});
 chomp($machine_name);
 my $server_host = $machine_name . '.local';
@@ -203 +203 @@
   {
     print " * Spawning Daemon...\n" unless (!$debug);
-    my $logs_dir = &util::filename_cat($ENV{'GSDLHOME'}, 'collect', $collection, 'logs');
-    if (!-d $logs_dir)
-    {
-      mkdir($logs_dir, 0755);
-    }
-    my $daemon_out_path = &util::filename_cat($logs_dir, 'tdbserver.out');
-    my $daemon_err_path = &util::filename_cat($logs_dir, 'tdbserver.err');
-    $pid = Proc::Daemon::Init( { work_dir => getcwd(),
-                                 child_STDOUT => $daemon_out_path,
-                                 child_STDERR => $daemon_err_path,
-                               } );
+    if ($debug)
+    {
+      my $logs_dir = &util::filename_cat($ENV{'GSDLHOME'}, 'collect', $collection, 'logs');
+      if (!-d $logs_dir)
+      {
+        mkdir($logs_dir, 0755);
+      }
+      my $daemon_out_path = &util::filename_cat($logs_dir, 'tdbserver.out');
+      my $daemon_err_path = &util::filename_cat($logs_dir, 'tdbserver.err');
+      $pid = Proc::Daemon::Init( { work_dir => getcwd(),
+                                   child_STDOUT => $daemon_out_path,
+                                   child_STDERR => $daemon_err_path,
+                                 } );
+    }
+    else
+    {
+      # Streams to /dev/null
+      $pid = Proc::Daemon::Init( { work_dir => getcwd(),
+                                 } );
+    }
   }