Changeset 25455 for gs2-extensions

Timestamp:

2012-04-23T11:00:25+12:00 (12 years ago)

Author:

jmt12

Message:

David suggested I try an explicit close on the underlying TDBCLI to ensure the harness can terminate properly

File:

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

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

@@ -77 +77 @@
 # Globally available - but once set these are read-only - so locking isn't
 # an issue
-my $use_harness = 0;
+my $use_harness = 1;
 my $tdbexe = 'tdbcli';
 my $parent_pid = 0;
@@ -430 +430 @@
       my $record = '[' . $key . ']' . $action . $payload;
       # Open harness to TDBCLI
+      &debugPrint($the_count, $tid, 'TDBCLI', 'Opening harness');
       my @tdb_command = ($tdbexe, $tdb_path, '-mid ' . $the_count);
       my $buffer_to_tdb = '';
@@ -441 +442 @@
       # - write the data to the TDBCLI
       $buffer_to_tdb = $record . "\n";
-      my $write_msg = '#' . $the_count . ' writing: |' . $record . '| => ';
       while (length($buffer_to_tdb))
       {
-        $write_msg .='.';
         pump($tdb_harness);
       }
-      print STDERR $write_msg . "\n";
       # - read any response from TDBCLI
-      my $read_msg = '#' . $the_count . ' reading: ';
+      &debugPrint($the_count, $tid, 'TDBCLI', 'Reading');
       while ($buffer_from_tdb !~ /-{70}/)
       {
-        $read_msg .= '.';
         pump($tdb_harness);
       }
-      print STDERR $read_msg . ' => |' . $buffer_from_tdb . "|\n";
+      # - explicitly tell the pipe to quit (empty key)
+      &debugPrint($the_count, $tid, 'TDBCLI', 'Closing');
+      $buffer_to_tdb = "[]\n";
+      while (length($buffer_to_tdb))
+      {
+        pump($tdb_harness);
+      }
       # - not that this result doesn't include the [Server] prefix as it
       #   may be parsed for data by the client
@@ -461 +464 @@
       chomp($result);
       # Finished with harness
+      &debugPrint($the_count, $tid, 'TDBCLI', 'Finishing harness');
       finish($tdb_harness);
+      &debugPrint($the_count, $tid, 'TDBCLI', 'Complete');
     }
     # Use different TDB tools depending on arguments
@@ -467 +472 @@
     elsif ($action eq '?')
     {
-      my $command = 'tdbget "' . $tdb_path . '" "' . $key . '"';
-      &debugPrint($the_count, $tid, 'TDBGET', 'Command: ' . $command);
-      my $result = `$command`;
+      my $command1 = 'tdbget "' . $tdb_path . '" "' . $key . '"';
+      &debugPrint($the_count, $tid, 'TDBGET', 'Command: ' . $command1);
+      my $result = `$command1`;
       &debugPrint($the_count, $tid, 'TDBGET', 'Result: ' . $result);
       if ($result =~ /-{70}/)
@@ -479 +484 @@
     elsif ($action eq '+' || $action eq '-')
     {
-      my $command = 'txt2tdb "' . $tdb_path . '" -append';
-      &debugPrint($the_count, $tid, 'TXT2TDB', 'Command: ' . $command);
-      open(my $infodb_handle, '| ' . $command) or die("Error! Failed to open pipe to TXT2TDB\n");
+      my $command2 = 'txt2tdb "' . $tdb_path . '" -append';
+      &debugPrint($the_count, $tid, 'TXT2TDB', 'Command: ' . $command2);
+      open(my $infodb_handle, '| ' . $command2) or die("Error! Failed to open pipe to TXT2TDB\n");
       print $infodb_handle '[' . $key . ']';
       if ($action eq '-')