Changeset 27532 for gs2-extensions

Timestamp:

2013-06-04T11:12:36+12:00 (11 years ago)

Author:

jmt12

Message:

Add the ability to configure the Thrift connector using a 'thrift.conf' file in the collections etc folder

File:

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

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

@@ -45 +45 @@
   die "GEXTPARALLELBUILDING not set\n" unless defined $ENV{'GEXTPARALLELBUILDING'};
   die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};
+  die "GSDLCOLLECTDIR not set\n" unless defined $ENV{'GSDLCOLLECTDIR'};
   # We need the Perl version before continuing
   if (!defined $ENV{'PERL_VERSION'})
@@ -72 +73 @@
 
 # Configuration
-my $host = "medusa.local";
+my $host = "localhost";
 my $port = 58660;
 my $debug = 0;
 my $debug_encoding = 0;
+# Testing shows 64k is pretty optimal
 #my $buffer_length =    4 * 1024; # 4k blocks
 #my $buffer_length =    8 * 1024; # 8k blocks
@@ -115 +117 @@
   if (!defined $thrift_client)
   {
-    ###rint "Create Thrift Client to $host:$port\n";
+    # Look for a configuration file to override the default localhost:58660
+    # settings
+    my $conf_file_path = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, 'etc', 'thrift.conf');
+    if (&FileUtils::fileExists($conf_file_path))
+    {
+      print "Found Thrift configuration file:\n";
+      my $conf_raw = &FileUtils::fileGetContents($conf_file_path);
+      if ($conf_raw =~ /^([^:]+):(\d+)/)
+      {
+        $host = $1;
+        print " - Host: " . $host . "\n";
+        $port = $2;
+        print " - Port: " . $port . "\n";
+      }
+    }
+
+    print "Establish Thrift client connecting to: $host:$port\n";
     my $socket = Thrift::Socket->new($host, $port);
     $socket->setSendTimeout(10000);