From 909e7d5ad6ebf8a40844581e2eb1d4f5e977110f Mon Sep 17 00:00:00 2001
From: survaaki <survaaki@igm.net.nz>
Date: Thu, 21 Nov 2019 16:29:36 +1000
Subject: [PATCH 1/2] early config.uploadModsToMaster check

Move check to start of function for config.uploadModsToMaster. When disabled, write one log line instead of one log line per mod.
---
 client.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/client.js b/client.js
index 8f20ae33..14e659f6 100644
--- a/client.js
+++ b/client.js
@@ -737,19 +737,19 @@ async function instanceManagement(instanceconfig) {
 	
 	setTimeout(function(){hashMods(instance, uploadMods)}, 5000);
 	function uploadMods(modHashes) {
-		// [{modName:string,hash:string}, ... ]
-		for(let i=0;i<modHashes.length;i++){
-			let payload = {
-				modName: modHashes[i].modName,
-				hash: modHashes[i].hash,
-			};
-			needle.post(config.masterIP + ":" + config.masterPort + '/api/checkMod', payload, needleOptionsWithTokenAuthHeader, function (err, response, body) {
-				if(err) console.error("Unable to contact master server /api/checkMod! Please check your config.json.");
-				if(response && body && body == "found") {
-					console.log("master has mod "+modHashes[i].modName);
-				} else if (response && body && typeof body == "string") {
-					let mod = response.body;
-					if(config.uploadModsToMaster){
+		if (config.uploadModsToMaster) {
+			// [{modName:string,hash:string}, ... ]
+			for(let i=0;i<modHashes.length;i++){
+				let payload = {
+					modName: modHashes[i].modName,
+					hash: modHashes[i].hash,
+				};
+				needle.post(config.masterIP + ":" + config.masterPort + '/api/checkMod', payload, needleOptionsWithTokenAuthHeader, function (err, response, body) {
+					if(err) console.error("Unable to contact master server /api/checkMod! Please check your config.json.");
+					if(response && body && body == "found") {
+						console.log("master has mod "+modHashes[i].modName);
+					} else if (response && body && typeof body == "string") {
+						let mod = response.body;
 						console.log("Sending mod: " + mod);
 						// Send mods master says it wants
 						// response.body is a string which is a modName.zip
@@ -766,11 +766,11 @@ async function instanceManagement(instanceconfig) {
 						});
 						var form = req.form();
 						form.append('file', fs.createReadStream(config.instanceDirectory+"/"+instance+"/mods/"+mod));
-					} else {
-						console.log("Not sending mod: " + mod + " to master because config.uploadModsToMaster is not enabled")
 					}
-				}
-			});
+				});
+			}
+		} else {
+			console.log("Bypassing sending mods to master because config.uploadModsToMaster is not enabled")
 		}
 	}
 } // END OF INSTANCE START ---------------------------------------------------------------------

From c380fe269ffd4be39ff93c799eedaae8d77d23e2 Mon Sep 17 00:00:00 2001
From: Survaaki <survaaki@igm.net.nz>
Date: Fri, 22 Nov 2019 09:40:07 +0000
Subject: [PATCH 2/2] Added changelog entry for uploadModsToMaster logging
 changes

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7d97248..8200fbd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Version 1.2.4
 - Removed broken remote combinator signaling.
 - Fixed research sync endlessly updating already researched technologies
 - Removed obsolete item/fluid statistics from clusterioMod
+- Removed per mod upload logging when config.uploadModsToMaster disabled
 
 
 Version 1.2.3