X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=server%2Fserve-analysis.js;h=de884a3439f68ade5b11b4a16255cb07bd9895ab;hp=0490e96f604a2639102aa62cc572320208b23fe7;hb=93c084f827a5783b20a3b3349463187c6d342810;hpb=83aa0538ddb9037d37295f7e6e68348773661d7a

diff --git a/server/serve-analysis.js b/server/serve-analysis.js
index 0490e96..de884a3 100644
--- a/server/serve-analysis.js
+++ b/server/serve-analysis.js
@@ -40,6 +40,13 @@ if (process.argv.length >= 6) {
 	port = parseInt(process.argv[5]);
 }
 
+// gRPC backends.
+var grpc_backends = ["localhost:50051", "localhost:50052"];
+if (process.argv.length >= 7) {
+	grpc_backends = process.argv[6].split(",");
+}
+hash_lookup.init(grpc_backends);
+
 // If set to 1, we are already processing a JSON update and should not
 // start a new one. If set to 2, we are _also_ having one in the queue.
 var json_lock = 0;
@@ -86,8 +93,19 @@ 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'];
+		new_json_contents = JSON.stringify(parsed);
+	}
+
 	var new_json = {
-		parsed: JSON.parse(new_json_contents),
+		parsed: parsed,
 		plain: new_json_contents,
 		last_modified: mtime
 	};
@@ -114,7 +132,7 @@ var create_json_historic_diff = function(new_json, history_left, new_diff_json,
 	}
 
 	var histobj = history_left.shift();
-	var diff = delta.JSON_delta.diff(histobj.parsed, new_json.parsed);
+	var diff = delta.JSON_delta.diff(histobj.parsed, new_json.parsed, false);
 	var diff_text = JSON.stringify(diff);
 	zlib.gzip(diff_text, function(err, buffer) {
 		if (err) throw err;
@@ -138,7 +156,7 @@ var reread_file = function(event, filename) {
 	if (json_lock == 1) {
 		// Already processing; wait a bit.
 		json_lock = 2;
-		setTimeout(function() { json_lock = 1; reread_file(event, filename); }, 100);
+		setTimeout(function() { if (json_lock == 2) json_lock = 1; reread_file(event, filename); }, 100);
 		return;
 	}
 	json_lock = 1;