From 4b4dbe9808a47d7c61aedc7b70ad4608cd39b7a0 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Wed, 12 Jul 2023 11:58:02 +0200
Subject: [PATCH] Small refactoring in serve-analysis.js.

---
 server/serve-analysis.js | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/server/serve-analysis.js b/server/serve-analysis.js
index 41610e1..2e176cc 100644
--- a/server/serve-analysis.js
+++ b/server/serve-analysis.js
@@ -157,6 +157,23 @@ var create_json_historic_diff = function(new_json, history_left, new_diff_json,
 	});
 }
 
+function read_entire_file(filename, callback) {
+	fs.open(filename, 'r', function(err, fd) {
+		if (err) throw err;
+		fs.fstat(fd, function(err, st) {
+			if (err) throw err;
+			var buffer = new Buffer(1048576);
+			fs.read(fd, buffer, 0, 1048576, 0, function(err, bytesRead, buffer) {
+				if (err) throw err;
+				fs.close(fd, function() {
+					var contents = buffer.toString('utf8', 0, bytesRead);
+					callback(contents, st.mtime.getTime());
+				});
+			});
+		});
+	});
+}
+
 var reread_file = function(event, filename) {
 	if (filename != path.basename(json_filename)) {
 		return;
@@ -173,19 +190,8 @@ var reread_file = function(event, filename) {
 	json_lock = 1;
 
 	console.log("Rereading " + json_filename);
-	fs.open(json_filename, 'r', function(err, fd) {
-		if (err) throw err;
-		fs.fstat(fd, function(err, st) {
-			if (err) throw err;
-			var buffer = new Buffer(1048576);
-			fs.read(fd, buffer, 0, 1048576, 0, function(err, bytesRead, buffer) {
-				if (err) throw err;
-				fs.close(fd, function() {
-					var new_json_contents = buffer.toString('utf8', 0, bytesRead);
-					replace_json(new_json_contents, st.mtime.getTime());
-				});
-			});
-		});
+	read_entire_file(json_filename, function(new_json_contents, mtime) {
+		replace_json(new_json_contents, mtime);
 	});
 
 	if (touch_timer !== undefined) {
-- 
2.39.2