kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-06 15:48:05 +00:00
Code Issues Projects Releases Wiki Activity

updatenotification: some fixes (#3628)

Browse Source 
continue from #3626 

Is it ok for you ?
This commit is contained in:
Bugsounet - Cédric 2024-11-09 09:59:12 +01:00 committed by GitHub
parent cd6f10c843
commit 4259d7c075
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -29,7 +29,7 @@ _This release is scheduled to be released on 2025-01-01._
### Fixed ### Fixed
- [updatenotification] Fix pm2 using detection when pm2 script is inside or outside MagicMirror root folder (#3576) (#3605) (#3626) - [updatenotification] Fix pm2 using detection when pm2 script is inside or outside MagicMirror root folder (#3576) (#3605) (#3626) (#3628)
- [core] Fix loading node_helper of modules: avoid black screen, display errors and continue loading with next module (#3578) - [core] Fix loading node_helper of modules: avoid black screen, display errors and continue loading with next module (#3578)
- [weather] Changed default value for weatherEndpoint of provider openweathermap to "/onecall" (#3574) - [weather] Changed default value for weatherEndpoint of provider openweathermap to "/onecall" (#3574)
- [tests] Fix electron tests with mock dates, the mock on server side was missing (#3597) - [tests] Fix electron tests with mock dates, the mock on server side was missing (#3597)

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

@ -1,7 +1,7 @@
const Exec = require("node:child_process").exec; const Exec = require("node:child_process").exec;
const Spawn = require("node:child_process").spawn; const Spawn = require("node:child_process").spawn;
const fs = require("node:fs"); const fs = require("node:fs");
const pm2 = require("pm2");
const Log = require("logger"); const Log = require("logger");
/* /*
@ -47,8 +47,8 @@ class Updater {
this.autoRestart = config.updateAutorestart; this.autoRestart = config.updateAutorestart;
this.moduleList = {}; this.moduleList = {};
this.updating = false; this.updating = false;
this.usePM2 = false; this.usePM2 = false; // don't use pm2 by default
this.PM2 = null; this.PM2Id = null; // pm2 process number
this.version = global.version; this.version = global.version;
this.root_path = global.root_path; this.root_path = global.root_path;
Log.info("updatenotification: Updater Class Loaded!"); Log.info("updatenotification: Updater Class Loaded!");
@ -139,10 +139,11 @@ class Updater {
else this.npmRestart(); else this.npmRestart();
} }
// restart MagicMiror with "pm2" // restart MagicMiror with "pm2": use PM2Id for restart it
pm2Restart () { pm2Restart () {
Log.info("updatenotification: PM2 will restarting MagicMirror..."); Log.info("updatenotification: PM2 will restarting MagicMirror...");
pm2.restart(this.PM2, (err, proc) => { const pm2 = require("pm2");
pm2.restart(this.PM2Id, (err, proc) => {
if (err) { if (err) {
Log.error("updatenotification:[PM2] restart Error", err); Log.error("updatenotification:[PM2] restart Error", err);
} }
@ -155,7 +156,7 @@ class Updater {
const out = process.stdout; const out = process.stdout;
const err = process.stderr; const err = process.stderr;
const subprocess = Spawn("npm start", { cwd: this.root_path, shell: true, detached: true, stdio: ["ignore", out, err] }); const subprocess = Spawn("npm start", { cwd: this.root_path, shell: true, detached: true, stdio: ["ignore", out, err] });
subprocess.unref(); subprocess.unref(); // detach the newly launched process from the master process
process.exit(); process.exit();
} }
@ -165,49 +166,45 @@ class Updater {
return new Promise((resolve) => { return new Promise((resolve) => {
if (fs.existsSync("/.dockerenv")) { if (fs.existsSync("/.dockerenv")) {
Log.info("updatenotification: Running in docker container, not using PM2 ..."); Log.info("updatenotification: Running in docker container, not using PM2 ...");
this.usePM2 = false;
resolve(false); resolve(false);
return; return;
} }
if (process.env.unique_id === undefined) { if (process.env.unique_id === undefined) {
Log.info("updatenotification: [PM2] You are not using pm2"); Log.info("updatenotification: [PM2] You are not using pm2");
this.usePM2 = false;
resolve(false); resolve(false);
return; 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(`updatenotification: [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) => { pm2.connect((err) => {
if (err) { if (err) {
Log.error("updatenotification: [PM2]", err); Log.error("updatenotification: [PM2]", err);
this.usePM2 = false;
resolve(false); resolve(false);
return; return;
} }
pm2.list((err, list) => { pm2.list((err, list) => {
if (err) { if (err) {
Log.error("updatenotification: [PM2] Can't get process List!"); Log.error("updatenotification: [PM2] Can't get process List!");
this.usePM2 = false;
resolve(false); resolve(false);
return; return;
} }
list.forEach((pm) => { 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(`updatenotification: [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) { 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.PM2 = pm.pm_id; this.PM2Id = pm.pm_id;
this.usePM2 = true; this.usePM2 = true;
Log.info(`updatenotification: [PM2] You are using pm2 with id: ${this.PM2} (${pm.name})`); Log.info(`updatenotification: [PM2] You are using pm2 with id: ${this.PM2Id} (${pm.name})`);
resolve(true); resolve(true);
} else { } else {
Log.debug(`updatenotification: [PM2] pm2 process id: ${pm.pm_id} don't match...`); Log.debug(`updatenotification: [PM2] pm2 process id: ${pm.pm_id} don't match...`);
} }
}); });
pm2.disconnect(); pm2.disconnect();
if (!this.PM2) { if (!this.usePM2) {
Log.info("updatenotification: [PM2] You are not using pm2"); Log.info("updatenotification: [PM2] You are not using pm2");
this.usePM2 = false;
resolve(false); resolve(false);
} }
}); });