archive-gh-me/pm2
1
0
Fork 0
mirror of https://github.com/Unitech/pm2.git synced 2025-12-08 20:35:53 +00:00
Code Issues Projects Releases Wiki Activity

send RECYCLE option to backoffice - override MACHINE NAME with result returned

Browse Source
This commit is contained in:
Unitech 2015-08-10 15:28:18 +02:00
parent aa1cb6a126
commit bd627dbfdf
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Interactor/Daemon.js
View File

@ -201,10 +201,14 @@ var Daemon = {
}
}, function(err, km_data) {
self.current_km_data = km_data;
if (err) return cb(err);
if (err) {
return cb(err);
}
if (self.opts.RECYCLE) {
if (!km_data.name) {
console.error('Error no previous machine name for recycle option returned!');
}
self.opts.MACHINE_NAME = km_data.name;
};
// For Human feedback
if (process.send)

3
lib/Interactor/InteractorDaemonizer.js
View File

@ -336,9 +336,8 @@ InteractorDaemonizer.getSetKeys = function(secret_key, public_key, machine_name,
try {
var interaction_conf = json5.parse(fs.readFileSync(cst.INTERACTION_CONF));
if (!secret_key) {
if (!secret_key)
recycle = recycle ? recycle : interaction_conf.recycle;
}
public_key = public_key ? public_key : interaction_conf.public_key;
machine_name = machine_name ? machine_name : interaction_conf.machine_name;