From 6833ccdb97a2c8801abd89ff37950b77a2df6e63 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Fri, 7 Jun 2024 18:09:50 +0100
Subject: [PATCH] Revert "Improve command line logging (#3704)"

This reverts commit 25ec52b9120081f518e22100c975f7f27793d287.
---
 core/modules/commands/fetch.js  |  2 +-
 core/modules/commands/render.js |  4 ++--
 core/modules/commands/save.js   |  2 +-
 core/modules/server/server.js   | 16 +++++++---------
 core/modules/utils/logger.js    | 15 ---------------
 5 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/core/modules/commands/fetch.js b/core/modules/commands/fetch.js
index 5518277f6..07cda691c 100644
--- a/core/modules/commands/fetch.js
+++ b/core/modules/commands/fetch.js
@@ -120,7 +120,7 @@ Command.prototype.fetchFile = function(url,options,callback,redirectCount) {
 	        }
 	   	});
 	   	response.on("error",function(e) {
-			self.commander.log("Error on GET request: " + e);
+			console.log("Error on GET request: " + e);
 			callback(e);
 	   	});
 	});
diff --git a/core/modules/commands/render.js b/core/modules/commands/render.js
index 1ae28dd11..b396deef9 100644
--- a/core/modules/commands/render.js
+++ b/core/modules/commands/render.js
@@ -47,7 +47,7 @@ Render individual tiddlers and save the results to the specified files
 		$tw.utils.each(tiddlers,function(title) {
 			var filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]);
 			if(self.commander.verbose) {
-				self.commander.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
+				console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
 			}
 			var parser = wiki.parseTiddler(template || title),
 				widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
@@ -63,4 +63,4 @@ Render individual tiddlers and save the results to the specified files
 	exports.Command = Command;
 	
 	})();
-	
+	
\ No newline at end of file
diff --git a/core/modules/commands/save.js b/core/modules/commands/save.js
index cf9ff7883..3cb7ef08c 100644
--- a/core/modules/commands/save.js
+++ b/core/modules/commands/save.js
@@ -48,7 +48,7 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
 						}
 					});
 					if(self.commander.verbose) {
-						self.commander.log("Saving \"" + title + "\" to \"" + filepath + "\"");
+						console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");
 					}
 					try {
 						$tw.utils.saveTiddlerToFileSync(tiddler,fileInfo);
diff --git a/core/modules/server/server.js b/core/modules/server/server.js
index 324976f1d..d3c98f8fc 100644
--- a/core/modules/server/server.js
+++ b/core/modules/server/server.js
@@ -33,13 +33,7 @@ function Server(options) {
 	this.routes = options.routes || [];
 	this.authenticators = options.authenticators || [];
 	this.wiki = options.wiki;
-	this.logger = new $tw.utils.Logger("server",{colour: "cyan"});
-	this.logger.setPrefix(":" + process.pid + "-" + (Number(new Date()) - 1095776640000));
 	this.boot = options.boot || $tw.boot;
-	// Name the server and init the boot state
-	this.servername = $tw.utils.transliterateToSafeASCII(this.get("server-name") || this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
-	this.boot.origin = this.get("origin")? this.get("origin"): this.protocol+"://"+this.get("host")+":"+this.get("port");
-	this.boot.pathPrefix = this.get("path-prefix") || "";
 	// Initialise the variables
 	this.variables = $tw.utils.extend({},this.defaultVariables);
 	if(options.variables) {
@@ -98,6 +92,10 @@ function Server(options) {
 		this.protocol = "https";
 	}
 	this.transport = require(this.protocol);
+	// Name the server and init the boot state
+	this.servername = $tw.utils.transliterateToSafeASCII(this.get("server-name") || this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
+	this.boot.origin = this.get("origin")? this.get("origin"): this.protocol+"://"+this.get("host")+":"+this.get("port");
+	this.boot.pathPrefix = this.get("path-prefix") || "";
 }
 
 /*
@@ -289,9 +287,9 @@ Server.prototype.requestHandler = function(request,response,options) {
 	var route = self.findMatchingRoute(request,state);
 	// Optionally output debug info
 	if(self.get("debug-level") !== "none") {
-		self.logger.log("Request path:",JSON.stringify(state.urlInfo.href));
-		self.logger.log("Request headers:",JSON.stringify(request.headers));
-		self.logger.log("authenticatedUsername:",state.authenticatedUsername);
+		console.log("Request path:",JSON.stringify(state.urlInfo));
+		console.log("Request headers:",JSON.stringify(request.headers));
+		console.log("authenticatedUsername:",state.authenticatedUsername);
 	}
 	// Return a 404 if we didn't find a route
 	if(!route) {
diff --git a/core/modules/utils/logger.js b/core/modules/utils/logger.js
index 2e5a9a115..1bee04646 100644
--- a/core/modules/utils/logger.js
+++ b/core/modules/utils/logger.js
@@ -21,7 +21,6 @@ function Logger(componentName,options) {
 	options = options || {};
 	this.componentName = componentName || "";
 	this.colour = options.colour || "white";
-	this.prefix = options.prefix || "";
 	this.enable = "enable" in options ? options.enable : true;
 	this.save = "save" in options ? options.save : true;
 	this.saveLimit = options.saveLimit || 100 * 1024;
@@ -34,20 +33,6 @@ Logger.prototype.setSaveBuffer = function(logger) {
 	this.saveBufferLogger = logger;
 };
 
-/*
-Change the output colour
-*/
-Logger.prototype.setColour = function(colour) {
-	this.colour = colour || "white";
-};
-
-/*
-Change the prefix
-*/
-Logger.prototype.setPrefix = function(prefix) {
-	this.prefix = prefix || "";
-};
-
 /*
 Log a message
 */