Changeset 27591 for gs2-extensions/parallel-building

Timestamp:

2013-06-10T16:32:41+12:00 (11 years ago)

Author:

jmt12

Message:

Ensure Thrift will, be default, attempt to connect to the local machine (by proper name, and only localhost if nothing else is found) and also allow a configuration file to contain only a port number (by just going having:<empty_string><colon><number>)

File:

• gs2-extensions/parallel-building/trunk/src/perllib/FileUtils/HDThriftFS.pm (modified) (2 diffs)

gs2-extensions/parallel-building/trunk/src/perllib/FileUtils/HDThriftFS.pm

@@ -73 +73 @@
 
 # Configuration
-my $host = "localhost";
+my $host = (`hostname -s` || `hostname -a` || `hostname` || $ENV{'HOSTNAME'} || 'localhost');
+chomp($host);
 my $port = 58660;
 my $debug = 0;
@@ -124 +125 @@
       print " * Found Thrift configuration file:\n";
       my $conf_raw = &FileUtils::fileGetContents($conf_file_path);
-      if ($conf_raw =~ /^([^:]+):(\d+)/)
-      {
-        $host = $1;
-        print " - Host: " . $host . "\n";
+      if ($conf_raw =~ /^([^:]*):(\d+)/)
+      {
+        my $new_host = $1;
         $port = $2;
+        if ($new_host ne '' && $new_host ne 'localhost')
+        {
+          $host = $new_host;
+          print " - Host: " . $host . "\n";
+        }
         print " - Port: " . $port . "\n";
       }