Skip to content

Commit

Permalink
[updatenotification] Fix pm2 using detection when pm2 script is insid…
Browse files Browse the repository at this point in the history
…e or outside MagicMirror root folder (#3605)

This will fix #3576 

@FrankBlackMG: 

I don't use `*env.unique_id` because some others modules can use pm2 too
for starting a service and unique_id is the same (this will make
confusion)
So I check `name` and `pm_id` for found it
  • Loading branch information
bugsounet authored Oct 28, 2024
1 parent c96326b commit 399e2ae
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ _This release is scheduled to be released on 2025-01-01._

### Fixed

- [updatenotification] Fix pm2 using detection when pm2 script is in MagicMirror root folder (#3576)
- [updatenotification] Fix pm2 using detection when pm2 script is inside or outside MagicMirror root folder (#3576) (#3605)
- [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)
- [tests] fix electron tests with mock dates, the mock on server side was missing (#3597)
Expand Down
4 changes: 3 additions & 1 deletion modules/default/updatenotification/update_helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,9 @@ class Updater {
return;
}
list.forEach((pm) => {
if (pm.pm2_env.version === this.version && pm.pm2_env.status === "online" && pm.pm2_env.pm_cwd.includes(`${this.root_path}`)) {
Log.debug(`[PM2] pm2 name: ${pm.name} -- in process env: ${process.env.name}`)
Log.debug(`[PM2] pm2 pm_id: ${pm.pm_id} -- in process env: ${process.env.pm_id}`)
if (pm.pm2_env.status === "online" && process.env.name === pm.name && +process.env.pm_id === +pm.pm_id) {
this.PM2 = pm.name;
this.usePM2 = true;
Log.info("updatenotification: [PM2] You are using pm2 with", this.PM2);
Expand Down

0 comments on commit 399e2ae

Please sign in to comment.