Send gRPC backends from the Perl code to the Node.js.

Makes it easier to keep all the config for one machine in one place.

diff --git a/config.pm b/config.pm
index 8050adf349cf5fea2aa49d7f7c8e4cdd407c4318..7de44078afdfb91e5b4c85f11e4d78bfccdc5634 100644 (file)
--- a/config.pm
+++ b/config.pm
@@ -45,6 +45,7 @@ our %engine_config = (
        'Hash' => '1024',
 #      'MultiPV' => '2'
 );
+our $engine_grpc_backend = undef;  # Not used by us, but will be communicated to serve-analysis.js.
 
 # Separate engine for multi-PV; can be undef for none.
 our $engine2_cmdline = undef;
@@ -54,6 +55,7 @@ our %engine2_config = (
        'Hash' => '1024',
        'Threads' => '8',
 );
+our $engine2_grpc_backend = undef;  # Not used by us, but will be communicated to serve-analysis.js.
 
 our $uci_assume_full_compliance = 0;                    # dangerous :-)
 our $update_max_interval = 1.0;

diff --git a/remoteglot.pl b/remoteglot.pl
index 4b674969c204e24c3a575c633cee431fbef4bf42..9a1ee4ca415b941ba926cd7036f49175480bdbae 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -67,7 +67,7 @@ select(TBLOG);
 $| = 1;
 
 select(STDOUT);
-umask 0022;
+umask 0027;  # analysis.json should not be served to users.
 
 # open the chess engine
 my $engine = open_engine($remoteglotconf::engine_cmdline, 'E1', sub { handle_uci(@_, 1); });
@@ -847,6 +847,14 @@ sub output_json {
        if (defined($remoteglotconf::engine_details)) {
                $json->{'engine'}{'details'} = $remoteglotconf::engine_details;
        }
+       my @grpc_backends = ();
+       if (defined($remoteglotconf::engine_grpc_backend)) {
+               push @grpc_backends, $remoteglotconf::engine_grpc_backend;
+       }
+       if (defined($remoteglotconf::engine2_grpc_backend)) {
+               push @grpc_backends, $remoteglotconf::engine2_grpc_backend;
+       }
+       $json->{'internal'}{'grpc_backends'} = \@grpc_backends;
        if (defined($remoteglotconf::move_source)) {
                $json->{'move_source'} = $remoteglotconf::move_source;
        }

diff --git a/server/hash-lookup.js b/server/hash-lookup.js
index b9d5f008250a3a0fe479bd01552aeed3006e3395..032b87be2f1924397de7bc7c4d4edccaea8c6f26 100644 (file)
--- a/server/hash-lookup.js
+++ b/server/hash-lookup.js
@@ -7,11 +7,27 @@ var hashprobe_proto = grpc.load(PROTO_PATH).hashprobe;
 var board = new Chess();
 
 var clients = [];
+var current_servers = [];
+
+var need_reinit = function(servers) {
+       if (servers.length != current_servers.length) {
+               return true;
+       }
+       for (var i = 0; i < servers.length; ++i) {
+               if (servers[i] != current_servers[i]) {
+                       return true;
+               }
+       }
+       return false;
+}
+exports.need_reinit = need_reinit;
 
 var init = function(servers) {
+       clients = [];
        for (var i = 0; i < servers.length; ++i) {
                clients.push(new hashprobe_proto.HashProbe(servers[i], grpc.credentials.createInsecure()));
        }
+       current_servers = servers;
 }
 exports.init = init;
 

diff --git a/server/serve-analysis.js b/server/serve-analysis.js
index 22bc20d337d1585cb99df43e41519d0ff67ac1c5..ca9047f3df1767bf188ebbdd529b5dd8eb2ba997 100644 (file)
--- a/server/serve-analysis.js
+++ b/server/serve-analysis.js
@@ -93,8 +93,18 @@ var replace_json = function(new_json_contents, mtime) {
                }
        }
 
+       var parsed = JSON.parse(new_json_contents);
+
+       if (parsed['internal']) {
+               if (parsed['internal']['grpc_backends'] &&
+                   hash_lookup.need_reinit(parsed['internal']['grpc_backends'])) {
+                       hash_lookup.init(parsed['internal']['grpc_backends']);
+               }
+               delete parsed['internal'];
+       }
+
        var new_json = {
-               parsed: JSON.parse(new_json_contents),
+               parsed: parsed,
                plain: new_json_contents,
                last_modified: mtime
        };