kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-12-12 01:42:19 +00:00
Code Issues Projects Releases Wiki Activity

logger: add calling filename as prefix on server side (#3926)

Browse Source
This commit is contained in:
Karsten Hassel
2025-10-22 22:50:31 +02:00
committed by GitHub
parent a1c1e9560c
commit bc0d36503a
15 changed files with 119 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/default/calendar/calendarfetcher.js
View File

@@ -57,7 +57,7 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
try {
data = ical.parseICS(responseData);
Log.debug(`[calendar] parsed data=${JSON.stringify(data, null, 2)}`);
Log.debug(`parsed data=${JSON.stringify(data, null, 2)}`);
events = CalendarFetcherUtils.filterEvents(data, {
excludedEvents,
includePastEvents,
@@ -91,7 +91,7 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
* Broadcast the existing events.
*/
this.broadcastEvents = function () {
Log.info(`[calendar] Fetcher: Broadcasting ${events.length} events from ${url}.`);
Log.info(`Fetcher: Broadcasting ${events.length} events from ${url}.`);
eventsReceivedCallback(this);
};

40
modules/default/calendar/calendarfetcherutils.js
View File

@@ -95,26 +95,26 @@ const CalendarFetcherUtils = {
const oneDayInMs = 24 * 60 * 60000;
let searchFromDate = pastLocalMoment.clone().subtract(Math.max(durationInMs, oneDayInMs), "milliseconds").toDate();
let searchToDate = futureLocalMoment.clone().add(1, "days").toDate();
Log.debug(`[calendar] Search for recurring events between: ${searchFromDate} and ${searchToDate}`);
Log.debug(`Search for recurring events between: ${searchFromDate} and ${searchToDate}`);
// if until is set, and its a full day event, force the time to midnight. rrule gets confused with non-00 offset
// looks like MS Outlook sets the until time incorrectly for fullday events
if ((rule.options.until !== undefined) && CalendarFetcherUtils.isFullDayEvent(event)) {
Log.debug("[calendar] fixup rrule until");
Log.debug("fixup rrule until");
rule.options.until = moment(rule.options.until).clone().startOf("day").add(1, "day")
.toDate();
}
Log.debug("[calendar] fix rrule start=", rule.options.dtstart);
Log.debug("[calendar] event before rrule.between=", JSON.stringify(event, null, 2), "exdates=", event.exdate);
Log.debug(`[calendar] RRule: ${rule.toString()}`);
Log.debug("fix rrule start=", rule.options.dtstart);
Log.debug("event before rrule.between=", JSON.stringify(event, null, 2), "exdates=", event.exdate);
Log.debug(`RRule: ${rule.toString()}`);
rule.options.tzid = null; // RRule gets *very* confused with timezones
let dates = rule.between(searchFromDate, searchToDate, true, () => {
return true;
});
Log.debug(`[calendar] Title: ${event.summary}, with dates: \n\n${JSON.stringify(dates)}\n`);
Log.debug(`Title: ${event.summary}, with dates: \n\n${JSON.stringify(dates)}\n`);
// shouldn't need this anymore, as RRULE not passed junk
dates = dates.filter((d) => {
@@ -140,7 +140,7 @@ const CalendarFetcherUtils = {
return CalendarFetcherUtils.isFullDayEvent(event) ? startMoment.startOf("day") : startMoment;
};
Log.debug(`[calendar] There are ${Object.entries(data).length} calendar entries.`);
Log.debug(`There are ${Object.entries(data).length} calendar entries.`);
const now = moment();
const pastLocalMoment = config.includePastEvents ? now.clone().startOf("day").subtract(config.maximumNumberOfDays, "days") : now;
@@ -153,10 +153,10 @@ const CalendarFetcherUtils = {
.subtract(1, "seconds");
Object.entries(data).forEach(([key, event]) => {
Log.debug("[calendar] Processing entry...");
Log.debug("Processing entry...");
const title = CalendarFetcherUtils.getTitleFromEvent(event);
Log.debug(`[calendar] title: ${title}`);
Log.debug(`title: ${title}`);
// Return quickly if event should be excluded.
let { excluded, eventFilterUntil } = this.shouldEventBeExcluded(config, title);
@@ -174,7 +174,7 @@ const CalendarFetcherUtils = {
}
if (event.type === "VEVENT") {
Log.debug(`[calendar] Event:\n${JSON.stringify(event, null, 2)}`);
Log.debug(`Event:\n${JSON.stringify(event, null, 2)}`);
let eventStartMoment = eventDate(event, "start");
let eventEndMoment;
@@ -191,12 +191,12 @@ const CalendarFetcherUtils = {
}
}
Log.debug(`[calendar] start: ${eventStartMoment.toDate()}`);
Log.debug(`[calendar] end: ${eventEndMoment.toDate()}`);
Log.debug(`start: ${eventStartMoment.toDate()}`);
Log.debug(`end: ${eventEndMoment.toDate()}`);
// Calculate the duration of the event for use with recurring events.
const durationMs = eventEndMoment.valueOf() - eventStartMoment.valueOf();
Log.debug(`[calendar] duration: ${durationMs}`);
Log.debug(`duration: ${durationMs}`);
const location = event.location || false;
const geo = event.geo || false;
@@ -217,12 +217,12 @@ const CalendarFetcherUtils = {
let dateKey = recurringEventStartMoment.tz("UTC").format("YYYY-MM-DD");
Log.debug("[calendar] event date dateKey=", dateKey);
Log.debug("event date dateKey=", dateKey);
// For each date that we're checking, it's possible that there is a recurrence override for that one day.
if (curEvent.recurrences !== undefined) {
Log.debug("[calendar] have recurrences=", curEvent.recurrences);
Log.debug("have recurrences=", curEvent.recurrences);
if (curEvent.recurrences[dateKey] !== undefined) {
Log.debug("[calendar] have a recurrence match for dateKey=", dateKey);
Log.debug("have a recurrence match for dateKey=", dateKey);
// We found an override, so for this recurrence, use a potentially different title, start date, and duration.
curEvent = curEvent.recurrences[dateKey];
// Some event start/end dates don't have timezones
@@ -237,12 +237,12 @@ const CalendarFetcherUtils = {
recurringEventEndMoment = moment(curEvent.end).tz(CalendarFetcherUtils.getLocalTimezone());
}
} else {
Log.debug("[calendar] recurrence key ", dateKey, " doesn't match");
Log.debug("recurrence key ", dateKey, " doesn't match");
}
}
// If there's no recurrence override, check for an exception date. Exception dates represent exceptions to the rule.
if (curEvent.exdate !== undefined) {
Log.debug("[calendar] have datekey=", dateKey, " exdates=", curEvent.exdate);
Log.debug("have datekey=", dateKey, " exdates=", curEvent.exdate);
if (curEvent.exdate[dateKey] !== undefined) {
// This date is an exception date, which means we should skip it in the recurrence pattern.
showRecurrence = false;
@@ -266,7 +266,7 @@ const CalendarFetcherUtils = {
}
if (showRecurrence === true) {
Log.debug(`[calendar] saving event: ${recurrenceTitle}`);
Log.debug(`saving event: ${recurrenceTitle}`);
newEvents.push({
title: recurrenceTitle,
startDate: recurringEventStartMoment.format("x"),
@@ -280,7 +280,7 @@ const CalendarFetcherUtils = {
description: description
});
} else {
Log.debug("[calendar] not saving event ", recurrenceTitle, eventStartMoment);
Log.debug("not saving event ", recurrenceTitle, eventStartMoment);
}
}
// End recurring event parsing.

8
modules/default/calendar/debug.js
View File

@@ -21,20 +21,20 @@ const auth = {
pass: pass
};
Log.log("[calendar] Create fetcher ...");
Log.log("Create fetcher ...");
const fetcher = new CalendarFetcher(url, fetchInterval, [], maximumEntries, maximumNumberOfDays, auth);
fetcher.onReceive(function (fetcher) {
Log.log("[calendar] ", fetcher.events());
Log.log(fetcher.events());
process.exit(0);
});
fetcher.onError(function (fetcher, error) {
Log.log("[calendar] Fetcher error:", error);
Log.log("Fetcher error:", error);
process.exit(1);
});
fetcher.startFetch();
Log.log("[calendar] Create fetcher done! ");
Log.log("Create fetcher done! ");

14
modules/default/calendar/node_helper.js
View File

@@ -5,7 +5,7 @@ const CalendarFetcher = require("./calendarfetcher");
module.exports = NodeHelper.create({
// Override start method.
start () {
Log.log(`[calendar] Starting node helper for: ${this.name}`);
Log.log(`Starting node helper for: ${this.name}`);
this.fetchers = [];
},
@@ -16,7 +16,7 @@ module.exports = NodeHelper.create({
} else if (notification === "FETCH_CALENDAR") {
const key = payload.id + payload.url;
if (typeof this.fetchers[key] === "undefined") {
Log.error("[calendar] No fetcher exists with key: ", key);
Log.error("No fetcher exists with key: ", key);
this.sendSocketNotification("CALENDAR_ERROR", { error_type: "MODULE_ERROR_UNSPECIFIED" });
return;
}
@@ -41,7 +41,7 @@ module.exports = NodeHelper.create({
try {
new URL(url);
} catch (error) {
Log.error("[calendar] Malformed calendar url: ", url, error);
Log.error("Malformed calendar url: ", url, error);
this.sendSocketNotification("CALENDAR_ERROR", { error_type: "MODULE_ERROR_MALFORMED_URL" });
return;
}
@@ -50,10 +50,10 @@ module.exports = NodeHelper.create({
let fetchIntervalCorrected;
if (typeof this.fetchers[identifier + url] === "undefined") {
if (fetchInterval < 60000) {
Log.warn(`[calendar] fetchInterval for url ${url} must be >= 60000`);
Log.warn(`fetchInterval for url ${url} must be >= 60000`);
fetchIntervalCorrected = 60000;
}
Log.log(`[calendar] Create new calendarfetcher for url: ${url} - Interval: ${fetchIntervalCorrected || fetchInterval}`);
Log.log(`Create new calendarfetcher for url: ${url} - Interval: ${fetchIntervalCorrected || fetchInterval}`);
fetcher = new CalendarFetcher(url, fetchIntervalCorrected || fetchInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth, broadcastPastEvents, selfSignedCert);
fetcher.onReceive((fetcher) => {
@@ -61,7 +61,7 @@ module.exports = NodeHelper.create({
});
fetcher.onError((fetcher, error) => {
Log.error("[calendar] Calendar Error. Could not fetch calendar: ", fetcher.url(), error);
Log.error("Calendar Error. Could not fetch calendar: ", fetcher.url(), error);
let error_type = NodeHelper.checkFetchError(error);
this.sendSocketNotification("CALENDAR_ERROR", {
id: identifier,
@@ -71,7 +71,7 @@ module.exports = NodeHelper.create({
this.fetchers[identifier + url] = fetcher;
} else {
Log.log(`[calendar] Use existing calendarfetcher for url: ${url}`);
Log.log(`Use existing calendarfetcher for url: ${url}`);
fetcher = this.fetchers[identifier + url];
fetcher.broadcastEvents();
}

16
modules/default/newsfeed/newsfeedfetcher.js
View File

@@ -67,10 +67,10 @@ const NewsfeedFetcher = function (url, reloadInterval, encoding, logFeedWarnings
hash: crypto.createHash("sha256").update(`${pubdate} :: ${title} :: ${url}`).digest("hex")
});
} else if (logFeedWarnings) {
Log.warn("[newsfeed] Can't parse feed item:", item);
Log.warn(`[newsfeed] Title: ${title}`);
Log.warn(`[newsfeed] Description: ${description}`);
Log.warn(`[newsfeed] Pubdate: ${pubdate}`);
Log.warn("Can't parse feed item:", item);
Log.warn(`Title: ${title}`);
Log.warn(`Description: ${description}`);
Log.warn(`Pubdate: ${pubdate}`);
}
});
@@ -94,10 +94,10 @@ const NewsfeedFetcher = function (url, reloadInterval, encoding, logFeedWarnings
const ttlms = Math.min(minutes * 60 * 1000, 86400000);
if (ttlms > reloadIntervalMS) {
reloadIntervalMS = ttlms;
Log.info(`[newsfeed] reloadInterval set to ttl=${reloadIntervalMS} for url ${url}`);
Log.info(`reloadInterval set to ttl=${reloadIntervalMS} for url ${url}`);
}
} catch (error) {
Log.warn(`[newsfeed] feed ttl is no valid integer=${minutes} for url ${url}`);
Log.warn(`feed ttl is no valid integer=${minutes} for url ${url}`);
}
});
@@ -148,10 +148,10 @@ const NewsfeedFetcher = function (url, reloadInterval, encoding, logFeedWarnings
*/
this.broadcastItems = function () {
if (items.length <= 0) {
Log.info("[newsfeed] No items to broadcast yet.");
Log.info("No items to broadcast yet.");
return;
}
Log.info(`[newsfeed] Broadcasting ${items.length} items.`);
Log.info(`Broadcasting ${items.length} items.`);
itemsReceivedCallback(this);
};

8
modules/default/newsfeed/node_helper.js
View File

@@ -32,14 +32,14 @@ module.exports = NodeHelper.create({
try {
new URL(url);
} catch (error) {
Log.error("[newsfeed] Error: Malformed newsfeed url: ", url, error);
Log.error("Error: Malformed newsfeed url: ", url, error);
this.sendSocketNotification("NEWSFEED_ERROR", { error_type: "MODULE_ERROR_MALFORMED_URL" });
return;
}
let fetcher;
if (typeof this.fetchers[url] === "undefined") {
Log.log(`[newsfeed] Create new newsfetcher for url: ${url} - Interval: ${reloadInterval}`);
Log.log(`Create new newsfetcher for url: ${url} - Interval: ${reloadInterval}`);
fetcher = new NewsfeedFetcher(url, reloadInterval, encoding, config.logFeedWarnings, useCorsProxy);
fetcher.onReceive(() => {
@@ -47,7 +47,7 @@ module.exports = NodeHelper.create({
});
fetcher.onError((fetcher, error) => {
Log.error("[newsfeed] Error: Could not fetch newsfeed: ", url, error);
Log.error("Error: Could not fetch newsfeed: ", url, error);
let error_type = NodeHelper.checkFetchError(error);
this.sendSocketNotification("NEWSFEED_ERROR", {
error_type
@@ -56,7 +56,7 @@ module.exports = NodeHelper.create({
this.fetchers[url] = fetcher;
} else {
Log.log(`[newsfeed] Use existing newsfetcher for url: ${url}`);
Log.log(`Use existing newsfetcher for url: ${url}`);
fetcher = this.fetchers[url];
fetcher.setReloadInterval(reloadInterval);
fetcher.broadcastItems();

18
modules/default/updatenotification/git_helper.js
View File

@@ -24,7 +24,7 @@ class GitHelper {
const { stderr } = await this.execShell(`cd ${moduleFolder} && git remote -v`);
if (stderr) {
Log.error(`[updatenotification] Failed to fetch git data for ${moduleFolder}: ${stderr}`);
Log.error(`Failed to fetch git data for ${moduleFolder}: ${stderr}`);
return false;
}
@@ -40,7 +40,7 @@ class GitHelper {
}
try {
Log.info(`[updatenotification] Checking git for module: ${moduleName}`);
Log.info(`Checking git for module: ${moduleName}`);
// Throws error if file doesn't exist
fs.statSync(path.join(moduleFolder, ".git"));
@@ -72,7 +72,7 @@ class GitHelper {
const { stderr, stdout } = await this.execShell(`cd ${repo.folder} && git rev-parse HEAD`);
if (stderr) {
Log.error(`[updatenotification] Failed to get current commit hash for ${repo.module}: ${stderr}`);
Log.error(`Failed to get current commit hash for ${repo.module}: ${stderr}`);
}
gitInfo.hash = stdout;
@@ -81,7 +81,7 @@ class GitHelper {
const { stderr, stdout } = await this.execShell(`cd ${repo.folder} && git status -sb`);
if (stderr) {
Log.error(`[updatenotification] Failed to get git status for ${repo.module}: ${stderr}`);
Log.error(`Failed to get git status for ${repo.module}: ${stderr}`);
// exit without git status info
return;
}
@@ -151,7 +151,7 @@ class GitHelper {
const { stdout } = await this.execShell(`cd ${repo.folder} && git ls-remote -q --tags --refs`);
tagList = stdout.trim();
} catch (err) {
Log.error(`[updatenotification] Failed to get tag list for ${repo.module}: ${err}`);
Log.error(`Failed to get tag list for ${repo.module}: ${err}`);
}
// check if tag is between commits and only report behind > 0 if so
try {
@@ -162,13 +162,13 @@ class GitHelper {
}
if (cnt === 0) gitInfo.behind = 0;
} catch (err) {
Log.error(`[updatenotification] Failed to get git revisions for ${repo.module}: ${err}`);
Log.error(`Failed to get git revisions for ${repo.module}: ${err}`);
}
}
return gitInfo;
} catch (err) {
Log.error(`[updatenotification] Failed to get git revisions for ${repo.module}: ${err}`);
Log.error(`Failed to get git revisions for ${repo.module}: ${err}`);
}
}
@@ -183,7 +183,7 @@ class GitHelper {
this.gitResultList.push(gitInfo);
}
} catch (e) {
Log.error(`[updatenotification] Failed to retrieve repo info for ${repo.module}: ${e}`);
Log.error(`Failed to retrieve repo info for ${repo.module}: ${e}`);
}
}
@@ -196,7 +196,7 @@ class GitHelper {
const allRepos = await this.gitResultList.map((module) => {
return new Promise((resolve) => {
if (module.behind > 0 && module.module !== "MagicMirror") {
Log.info(`[updatenotification] Update found for module: ${module.module}`);
Log.info(`Update found for module: ${module.module}`);
updates.push(module);
}
resolve(module);

42
modules/default/updatenotification/update_helper.js
View File

@@ -51,7 +51,7 @@ class Updater {
this.PM2Id = null; // pm2 process number
this.version = global.version;
this.root_path = global.root_path;
Log.info("[updatenotification] Updater Class Loaded!");
Log.info("Updater Class Loaded!");
}
// [main command] parse if module update is needed
@@ -81,7 +81,7 @@ class Updater {
await Promise.all(parser);
let updater = Object.values(this.moduleList);
Log.debug("[updatenotification] Update Result:", updater);
Log.debug("Update Result:", updater);
return updater;
}
@@ -107,24 +107,24 @@ class Updater {
if (module.updateCommand) {
Command = module.updateCommand;
} else {
Log.warn(`[updatenotification] Update of ${module.name} is not supported.`);
Log.warn(`Update of ${module.name} is not supported.`);
return Result;
}
Log.info(`[updatenotification] Updating ${module.name}...`);
Log.info(`Updating ${module.name}...`);
return new Promise((resolve) => {
Exec(Command, { cwd: modulePath, timeout: this.timeout }, (error, stdout, stderr) => {
if (error) {
Log.error(`[updatenotification] exec error: ${error}`);
Log.error(`exec error: ${error}`);
Result.error = true;
} else {
Log.info(`[updatenotification]:Update logs of ${module.name}: ${stdout}`);
Log.info(`Update logs of ${module.name}: ${stdout}`);
Result.updated = true;
if (this.autoRestart) {
Log.info("[updatenotification] Update done");
Log.info("Update done");
setTimeout(() => this.restart(), 3000);
} else {
Log.info("[updatenotification] Update done, don't forget to restart MagicMirror!");
Log.info("Update done, don't forget to restart MagicMirror!");
Result.needRestart = true;
}
}
@@ -141,18 +141,18 @@ class Updater {
// restart MagicMirror with "pm2": use PM2Id for restart it
pm2Restart () {
Log.info("[updatenotification] [PM2] restarting MagicMirror...");
Log.info("[PM2] restarting MagicMirror...");
const pm2 = require("pm2");
pm2.restart(this.PM2Id, (err, proc) => {
if (err) {
Log.error("[updatenotification] [PM2] restart Error", err);
Log.error("[PM2] restart Error", err);
}
});
}
// restart MagicMirror with "node --run start"
nodeRestart () {
Log.info("[updatenotification] Restarting MagicMirror...");
Log.info("Restarting MagicMirror...");
const out = process.stdout;
const err = process.stderr;
const subprocess = Spawn("node --run start", { cwd: this.root_path, shell: true, detached: true, stdio: ["ignore", out, err] });
@@ -162,49 +162,49 @@ class Updater {
// Check using pm2
check_PM2_Process () {
Log.info("[updatenotification] Checking PM2 using...");
Log.info("Checking PM2 using...");
return new Promise((resolve) => {
if (fs.existsSync("/.dockerenv")) {
Log.info("[updatenotification] Running in docker container, not using PM2 ...");
Log.info("[PM2] Running in docker container, not using PM2 ...");
resolve(false);
return;
}
if (process.env.unique_id === undefined) {
Log.info("[updatenotification] [PM2] You are not using pm2");
Log.info("[PM2] You are not using pm2");
resolve(false);
return;
}
Log.debug(`[updatenotification] [PM2] Search for pm2 id: ${process.env.pm_id} -- name: ${process.env.name} -- unique_id: ${process.env.unique_id}`);
Log.debug(`[PM2] Search for pm2 id: ${process.env.pm_id} -- name: ${process.env.name} -- unique_id: ${process.env.unique_id}`);
const pm2 = require("pm2");
pm2.connect((err) => {
if (err) {
Log.error("[updatenotification] [PM2]", err);
Log.error("[PM2]", err);
resolve(false);
return;
}
pm2.list((err, list) => {
if (err) {
Log.error("[updatenotification] [PM2] Can't get process List!");
Log.error("[PM2] Can't get process List!");
resolve(false);
return;
}
list.forEach((pm) => {
Log.debug(`[updatenotification] [PM2] found pm2 process id: ${pm.pm_id} -- name: ${pm.name} -- unique_id: ${pm.pm2_env.unique_id}`);
Log.debug(`[PM2] found pm2 process id: ${pm.pm_id} -- name: ${pm.name} -- unique_id: ${pm.pm2_env.unique_id}`);
if (pm.pm2_env.status === "online" && process.env.name === pm.name && +process.env.pm_id === +pm.pm_id && process.env.unique_id === pm.pm2_env.unique_id) {
this.PM2Id = pm.pm_id;
this.usePM2 = true;
Log.info(`[updatenotification] [PM2] You are using pm2 with id: ${this.PM2Id} (${pm.name})`);
Log.info(`[PM2] You are using pm2 with id: ${this.PM2Id} (${pm.name})`);
resolve(true);
} else {
Log.debug(`[updatenotification] [PM2] pm2 process id: ${pm.pm_id} don't match...`);
Log.debug(`[PM2] pm2 process id: ${pm.pm_id} don't match...`);
}
});
pm2.disconnect();
if (!this.usePM2) {
Log.info("[updatenotification] [PM2] You are not using pm2");
Log.info("[PM2] You are not using pm2");
resolve(false);
}
});