Adds prefixes to log messages

veeck · veeck · commit 665b36b03aa9 · 2025-10-20T09:42:28.000+02:00
diff --git a/js/animateCSS.js b/js/animateCSS.js
@@ -132,7 +132,7 @@ function addAnimateCSS (element, animation, animationTime) {
 	const node = document.getElementById(element);
 	if (!node) {
 		// don't execute animate: we don't find div
-		Log.warn("addAnimateCSS: node not found for", element);
+		Log.warn("[animateCSS] node not found for adding", element);
 		return;
 	}
 	node.style.setProperty("--animate-duration", `${animationTime}s`);
@@ -149,7 +149,7 @@ function removeAnimateCSS (element, animation) {
 	const node = document.getElementById(element);
 	if (!node) {
 		// don't execute animate: we don't find div
-		Log.warn("removeAnimateCSS: node not found for", element);
+		Log.warn("[animateCSS] node not found for removing", element);
 		return;
 	}
 	node.classList.remove("animate__animated", animationName);
diff --git a/js/check_config.js b/js/check_config.js
@@ -44,7 +44,7 @@ function checkConfigFile () {
 	}
 
 	// Validate syntax of the configuration file.
-	Log.info(`Checking config file ${configFileName} ...`);
+	Log.info(`[checkconfig] Checking config file ${configFileName} ...`);
 
 	// I'm not sure if all ever is utf-8
 	const configFile = fs.readFileSync(configFileName, "utf-8");
@@ -67,7 +67,7 @@ function checkConfigFile () {
 	);
 
 	if (errors.length === 0) {
-		Log.info(styleText("green", "Your configuration file doesn't contain syntax errors :)"));
+		Log.info(styleText("green", "[checkconfig] Your configuration file doesn't contain syntax errors :)"));
 		validateModulePositions(configFileName);
 	} else {
 		let errorMessage = "Your configuration file contains syntax errors :(";
@@ -84,7 +84,7 @@ function checkConfigFile () {
  * @param {string} configFileName - The path and filename of the configuration file to validate.
  */
 function validateModulePositions (configFileName) {
-	Log.info("Checking modules structure configuration ...");
+	Log.info("[checkconfig] Checking modules structure configuration ...");
 
 	const positionList = Utils.getModulePositions();
 
@@ -118,7 +118,7 @@ function validateModulePositions (configFileName) {
 
 	const valid = validate(data);
 	if (valid) {
-		Log.info(styleText("green", "Your modules structure configuration doesn't contain errors :)"));
+		Log.info(styleText("green", "[checkconfig] Your modules structure configuration doesn't contain errors :)"));
 	} else {
 		const module = validate.errors[0].instancePath.split("/")[2];
 		const position = validate.errors[0].instancePath.split("/")[3];
@@ -130,13 +130,13 @@ function validateModulePositions (configFileName) {
 		} else {
 			errorMessage += validate.errors[0].message;
 		}
-		Log.error(errorMessage);
+		Log.error("[checkconfig]", errorMessage);
 	}
 }
 
 try {
 	checkConfigFile();
 } catch (error) {
-	Log.error(error.message);
+	Log.error("[checkconfig]", error);
 	process.exit(1);
 }
diff --git a/js/electron.js b/js/electron.js
@@ -40,7 +40,7 @@ function createWindow () {
 	try {
 		electronSize = electron.screen.getPrimaryDisplay().workAreaSize;
 	} catch {
-		Log.warn("Could not get display size, using defaults ...");
+		Log.warn("[electron] Could not get display size, using defaults ...");
 	}
 
 	let electronSwitchesDefaults = ["autoplay-policy", "no-user-gesture-required"];
@@ -196,7 +196,7 @@ app.on("activate", function () {
  * core.stop() is called by process.on("SIGINT"... in `app.js`
  */
 app.on("before-quit", async (event) => {
-	Log.log("Shutting down server...");
+	Log.log("[electron] Shutting down server...");
 	event.preventDefault();
 	setTimeout(() => {
 		process.exit(0);
@@ -215,7 +215,7 @@ app.on("certificate-error", (event, webContents, url, error, certificate, callba
 
 if (process.env.clientonly) {
 	app.whenReady().then(() => {
-		Log.log("Launching client viewer application.");
+		Log.log("[electron] Launching client viewer application.");
 		createWindow();
 	});
 }
@@ -228,7 +228,7 @@ if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].includes(co
 	core.start().then((c) => {
 		config = c;
 		app.whenReady().then(() => {
-			Log.log("Launching application.");
+			Log.log("[electron] Launching application.");
 			createWindow();
 		});
 	});
diff --git a/js/main.js b/js/main.js
@@ -268,7 +268,6 @@ const MM = (function () {
 	const hideModule = function (module, speed, callback, options = {}) {
 		// set lockString if set in options.
 		if (options.lockString) {
-			// Log.log("Has lockstring: " + options.lockString);
 			if (module.lockStrings.indexOf(options.lockString) === -1) {
 				module.lockStrings.push(options.lockString);
 			}
diff --git a/js/module.js b/js/module.js
@@ -38,7 +38,6 @@ const Module = Class.extend({
 	 * Called when the module is instantiated.
 	 */
 	init () {
-		//Log.log(this.defaults);
 	},
 
 	/**
@@ -145,9 +144,9 @@ const Module = Class.extend({
 	 */
 	notificationReceived (notification, payload, sender) {
 		if (sender) {
-			// Log.log(this.name + " received a module notification: " + notification + " from sender: " + sender.name);
+			Log.debug(`${this.name} received a module notification: ${notification} from sender: ${sender.name}`);
 		} else {
-			// Log.log(this.name + " received a system notification: " + notification);
+			Log.debug(`${this.name} received a system notification: ${notification}`);
 		}
 	},
 
diff --git a/js/node_helper.js b/js/node_helper.js
@@ -4,15 +4,15 @@ const Class = require("./class");
 
 const NodeHelper = Class.extend({
 	init () {
-		Log.log("Initializing new module helper ...");
+		Log.log("[nodehelper] Initializing new module helper ...");
 	},
 
 	loaded () {
-		Log.log(`Module helper loaded: ${this.name}`);
+		Log.log(`[nodehelper] Module helper loaded: ${this.name}`);
 	},
 
 	start () {
-		Log.log(`Starting module helper: ${this.name}`);
+		Log.log(`[nodehelper] Starting module helper: ${this.name}`);
 	},
 
 	/**
@@ -21,7 +21,7 @@ const NodeHelper = Class.extend({
 	 * gracefully exit the module.
 	 */
 	stop () {
-		Log.log(`Stopping module helper: ${this.name}`);
+		Log.log(`[nodehelper] Stopping module helper: ${this.name}`);
 	},
 
 	/**
@@ -30,7 +30,7 @@ const NodeHelper = Class.extend({
 	 * @param {object}  payload The payload of the notification.
 	 */
 	socketNotificationReceived (notification, payload) {
-		Log.log(`${this.name} received a socket notification: ${notification} - Payload: ${payload}`);
+		Log.log(`[nodehelper] ${this.name} received a socket notification: ${notification} - Payload: ${payload}`);
 	},
 
 	/**
@@ -83,7 +83,7 @@ const NodeHelper = Class.extend({
 	setSocketIO (io) {
 		this.io = io;
 
-		Log.log(`Connecting socket for: ${this.name}`);
+		Log.log(`[nodehelper] Connecting socket for: ${this.name}`);
 
 		io.of(this.name).on("connection", (socket) => {
 			// register catch all.
diff --git a/js/translator.js b/js/translator.js
@@ -20,7 +20,7 @@ const Translator = (function () {
 						fileInfo = JSON.parse(xhr.responseText);
 					} catch (exception) {
 						// nothing here, but don't die
-						Log.error(` loading json file =${file} failed`);
+						Log.error(`[translator] loading json file =${file} failed`);
 					}
 					resolve(fileInfo);
 				}
@@ -67,22 +67,18 @@ const Translator = (function () {
 			}
 
 			if (this.translations[module.name] && key in this.translations[module.name]) {
-				// Log.log("Got translation for " + key + " from module translation: ");
 				return createStringFromTemplate(this.translations[module.name][key], variables);
 			}
 
 			if (key in this.coreTranslations) {
-				// Log.log("Got translation for " + key + " from core translation.");
 				return createStringFromTemplate(this.coreTranslations[key], variables);
 			}
 
 			if (this.translationsFallback[module.name] && key in this.translationsFallback[module.name]) {
-				// Log.log("Got translation for " + key + " from module translation fallback.");
 				return createStringFromTemplate(this.translationsFallback[module.name][key], variables);
 			}
 
 			if (key in this.coreTranslationsFallback) {
-				// Log.log("Got translation for " + key + " from core translation fallback.");
 				return createStringFromTemplate(this.coreTranslationsFallback[key], variables);
 			}
 
@@ -96,7 +92,7 @@ const Translator = (function () {
 		 * @param {boolean} isFallback Flag to indicate fallback translations.
 		 */
 		async load (module, file, isFallback) {
-			Log.log(`${module.name} - Load translation${isFallback ? " fallback" : ""}: ${file}`);
+			Log.log(`[translator] ${module.name} - Load translation${isFallback ? " fallback" : ""}: ${file}`);
 
 			if (this.translationsFallback[module.name]) {
 				return;
@@ -113,10 +109,10 @@ const Translator = (function () {
 		 */
 		async loadCoreTranslations (lang) {
 			if (lang in translations) {
-				Log.log(`Loading core translation file: ${translations[lang]}`);
+				Log.log(`[translator] Loading core translation file: ${translations[lang]}`);
 				this.coreTranslations = await loadJSON(translations[lang]);
 			} else {
-				Log.log("Configured language not found in core translations.");
+				Log.log("[translator] Configured language not found in core translations.");
 			}
 
 			await this.loadCoreTranslationsFallback();
@@ -129,7 +125,7 @@ const Translator = (function () {
 		async loadCoreTranslationsFallback () {
 			let first = Object.keys(translations)[0];
 			if (first) {
-				Log.log(`Loading core translation fallback file: ${translations[first]}`);
+				Log.log(`[translator] Loading core translation fallback file: ${translations[first]}`);
 				this.coreTranslationsFallback = await loadJSON(translations[first]);
 			}
 		}
diff --git a/modules/default/calendar/calendarfetcherutils.js b/modules/default/calendar/calendarfetcherutils.js
@@ -287,7 +287,6 @@ const CalendarFetcherUtils = {
 				} else {
 					// Single event.
 					const fullDayEvent = isFacebookBirthday ? true : CalendarFetcherUtils.isFullDayEvent(event);
-					// Log.debug("full day event")
 
 					// if the start and end are the same, then make end the 'end of day' value (start is at 00:00:00)
 					if (fullDayEvent && eventStartMoment.valueOf() === eventEndMoment.valueOf()) {

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,6 @@ const MM = (function () {`
`268`	`268`	`const hideModule = function (module, speed, callback, options = {}) {`
`269`	`269`	`// set lockString if set in options.`
`270`	`270`	`if (options.lockString) {`
`271`		`- // Log.log("Has lockstring: " + options.lockString);`
`272`	`271`	`if (module.lockStrings.indexOf(options.lockString) === -1) {`
`273`	`272`	`module.lockStrings.push(options.lockString);`
`274`	`273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ const Translator = (function () {`
`20`	`20`	`fileInfo = JSON.parse(xhr.responseText);`
`21`	`21`	`} catch (exception) {`
`22`	`22`	`// nothing here, but don't die`
`23`		- Log.error(` loading json file =${file} failed`);
	`23`	+ Log.error(`[translator] loading json file =${file} failed`);
`24`	`24`	`}`
`25`	`25`	`resolve(fileInfo);`
`26`	`26`	`}`
`@@ -67,22 +67,18 @@ const Translator = (function () {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`if (this.translations[module.name] && key in this.translations[module.name]) {`
`70`		`- // Log.log("Got translation for " + key + " from module translation: ");`
`71`	`70`	`return createStringFromTemplate(this.translations[module.name][key], variables);`
`72`	`71`	`}`
`73`	`72`
`74`	`73`	`if (key in this.coreTranslations) {`
`75`		`- // Log.log("Got translation for " + key + " from core translation.");`
`76`	`74`	`return createStringFromTemplate(this.coreTranslations[key], variables);`
`77`	`75`	`}`
`78`	`76`
`79`	`77`	`if (this.translationsFallback[module.name] && key in this.translationsFallback[module.name]) {`
`80`		`- // Log.log("Got translation for " + key + " from module translation fallback.");`
`81`	`78`	`return createStringFromTemplate(this.translationsFallback[module.name][key], variables);`
`82`	`79`	`}`
`83`	`80`
`84`	`81`	`if (key in this.coreTranslationsFallback) {`
`85`		`- // Log.log("Got translation for " + key + " from core translation fallback.");`
`86`	`82`	`return createStringFromTemplate(this.coreTranslationsFallback[key], variables);`
`87`	`83`	`}`
`88`	`84`
`@@ -96,7 +92,7 @@ const Translator = (function () {`
`96`	`92`	`* @param {boolean} isFallback Flag to indicate fallback translations.`
`97`	`93`	`*/`
`98`	`94`	`async load (module, file, isFallback) {`
`99`		- Log.log(`${module.name} - Load translation${isFallback ? " fallback" : ""}: ${file}`);
	`95`	+ Log.log(`[translator] ${module.name} - Load translation${isFallback ? " fallback" : ""}: ${file}`);
`100`	`96`
`101`	`97`	`if (this.translationsFallback[module.name]) {`
`102`	`98`	`return;`
`@@ -113,10 +109,10 @@ const Translator = (function () {`
`113`	`109`	`*/`
`114`	`110`	`async loadCoreTranslations (lang) {`
`115`	`111`	`if (lang in translations) {`
`116`		- Log.log(`Loading core translation file: ${translations[lang]}`);
	`112`	+ Log.log(`[translator] Loading core translation file: ${translations[lang]}`);
`117`	`113`	`this.coreTranslations = await loadJSON(translations[lang]);`
`118`	`114`	`} else {`
`119`		`- Log.log("Configured language not found in core translations.");`
	`115`	`+ Log.log("[translator] Configured language not found in core translations.");`
`120`	`116`	`}`
`121`	`117`
`122`	`118`	`await this.loadCoreTranslationsFallback();`
`@@ -129,7 +125,7 @@ const Translator = (function () {`
`129`	`125`	`async loadCoreTranslationsFallback () {`
`130`	`126`	`let first = Object.keys(translations)[0];`
`131`	`127`	`if (first) {`
`132`		- Log.log(`Loading core translation fallback file: ${translations[first]}`);
	`128`	+ Log.log(`[translator] Loading core translation fallback file: ${translations[first]}`);
`133`	`129`	`this.coreTranslationsFallback = await loadJSON(translations[first]);`
`134`	`130`	`}`
`135`	`131`	`}`