From 2b1ee64608087603e5c57063483d36eed8042eec Mon Sep 17 00:00:00 2001 From: K3v1nb0t Date: Wed, 14 Aug 2019 10:12:46 -0600 Subject: [PATCH 1/4] pm2 change way to receive process id on restart, reload and softReload Methods https://npmdoc.github.io/node-npmdoc-pm2/build/apidoc.html#apidoc.element.pm2.God.softReloadProcessId --- server/components/PM2Listener.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/components/PM2Listener.js b/server/components/PM2Listener.js index 26fa022..7a22406 100644 --- a/server/components/PM2Listener.js +++ b/server/components/PM2Listener.js @@ -246,6 +246,14 @@ PM2Listener.prototype._doByProcessId = function(host, pm_id, action) { return this._logger.info("PM2Listener", "Invalid host", host, "not in", Object.keys(this._pm2List)); } + if ( + action === 'restartProcessId' + || action === 'reloadProcessId' + || action === 'softReloadProcessId' + ) { + pm_id = { id: pm_id }; + } + this._logger.info("PM2Listener", host, pm_id, action); this._pm2List[host].rpc[action](pm_id, function(error) { From 0861f8ed2bd2a48e8564849fce9365737536c44f Mon Sep 17 00:00:00 2001 From: K3v1nb0t Date: Wed, 14 Aug 2019 14:46:26 -0600 Subject: [PATCH 2/4] fix testing --- test/unit/server/components/PM2ListenerTest.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/server/components/PM2ListenerTest.js b/test/unit/server/components/PM2ListenerTest.js index 5f22c2f..9c4b3c1 100644 --- a/test/unit/server/components/PM2ListenerTest.js +++ b/test/unit/server/components/PM2ListenerTest.js @@ -262,7 +262,7 @@ module.exports = { this._listener.restartProcess(host, pm_id); this._listener._pm2List[host].rpc.restartProcessId.callCount.should.equal(1); - this._listener._pm2List[host].rpc.restartProcessId.getCall(0).args[0].should.equal(pm_id); + this._listener._pm2List[host].rpc.restartProcessId.getCall(0).args[0].id.should.equal(pm_id); test.done(); }, @@ -370,7 +370,7 @@ module.exports = { this._listener.reloadProcess(host, pm_id); this._listener._pm2List[host].rpc.reloadProcessId.callCount.should.equal(1); - this._listener._pm2List[host].rpc.reloadProcessId.getCall(0).args[0].should.equal(pm_id); + this._listener._pm2List[host].rpc.reloadProcessId.getCall(0).args[0].id.should.equal(pm_id); test.done(); }, @@ -389,7 +389,7 @@ module.exports = { this._listener.reloadProcess(host, pm_id); this._listener._pm2List[host].rpc.softReloadProcessId.callCount.should.equal(1); - this._listener._pm2List[host].rpc.softReloadProcessId.getCall(0).args[0].should.equal(pm_id); + this._listener._pm2List[host].rpc.softReloadProcessId.getCall(0).args[0].id.should.equal(pm_id); test.done(); }, From 801de693f2224f257e46ed5ebaa4ed17d4e8aa62 Mon Sep 17 00:00:00 2001 From: K3v1nb0t Date: Wed, 14 Aug 2019 14:53:10 -0600 Subject: [PATCH 3/4] testing --- test/unit/server/components/PM2ListenerTest.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unit/server/components/PM2ListenerTest.js b/test/unit/server/components/PM2ListenerTest.js index 9c4b3c1..53aa842 100644 --- a/test/unit/server/components/PM2ListenerTest.js +++ b/test/unit/server/components/PM2ListenerTest.js @@ -389,6 +389,7 @@ module.exports = { this._listener.reloadProcess(host, pm_id); this._listener._pm2List[host].rpc.softReloadProcessId.callCount.should.equal(1); + console.log(this._listener._pm2List[host].rpc.softReloadProcessId.getCall(0).args[0]); this._listener._pm2List[host].rpc.softReloadProcessId.getCall(0).args[0].id.should.equal(pm_id); test.done(); From 069cb7f1830fdc044782b9f5ae877d51f133867f Mon Sep 17 00:00:00 2001 From: k3v1nb0t Date: Wed, 14 Aug 2019 14:56:25 -0600 Subject: [PATCH 4/4] Update PM2ListenerTest.js --- test/unit/server/components/PM2ListenerTest.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/unit/server/components/PM2ListenerTest.js b/test/unit/server/components/PM2ListenerTest.js index 53aa842..9c4b3c1 100644 --- a/test/unit/server/components/PM2ListenerTest.js +++ b/test/unit/server/components/PM2ListenerTest.js @@ -389,7 +389,6 @@ module.exports = { this._listener.reloadProcess(host, pm_id); this._listener._pm2List[host].rpc.softReloadProcessId.callCount.should.equal(1); - console.log(this._listener._pm2List[host].rpc.softReloadProcessId.getCall(0).args[0]); this._listener._pm2List[host].rpc.softReloadProcessId.getCall(0).args[0].id.should.equal(pm_id); test.done();