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

#3360 pm2 show wrong user, now display user who started the application

Browse Source
This commit is contained in:
wallet77 2018-01-12 10:36:53 +01:00
parent a85cbad55c
commit 1f38463836
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/API/CliUx.js
View File

@ -218,18 +218,6 @@ UX.dispAsTable = function(list, interact_infos) {
if (!list)
return console.log('list empty');
var current_user = '';
if (os.userInfo)
try {
current_user = os.userInfo().username;
} catch (err) {
// For the case of unhandled error for uv_os_get_passwd
// https://github.com/Unitech/pm2/issues/3184
current_user = '';
} else {
current_user = process.env.USER || process.env.LNAME || process.env.USERNAME || process.env.SUDO_USER || process.env.C9_USER || process.env.LOGNAME;
}
list.sort(function(a, b) {
if (a.pm2_env.name < b.pm2_env.name)
return -1;
@ -277,7 +265,7 @@ UX.dispAsTable = function(list, interact_infos) {
// User
if (!stacked)
obj[key].push(chalk.bold(l.pm2_env.uid || current_user));
obj[key].push(chalk.bold(l.pm2_env.uid || l.pm2_env.username));
safe_push(module_table, obj);
}
@ -314,7 +302,7 @@ UX.dispAsTable = function(list, interact_infos) {
// User
if (!stacked)
obj[key].push(chalk.bold(l.pm2_env.uid || current_user));
obj[key].push(chalk.bold(l.pm2_env.uid || l.pm2_env.username));
// Watch status
if (!stacked)

18
lib/God.js
View File

@ -16,7 +16,8 @@
var semver = require('semver');
var cluster = require('cluster');
var numCPUs = require('os').cpus() ? require('os').cpus().length : 1;
var os = require('os');
var numCPUs = os.cpus() ? os.cpus().length : 1;
var path = require('path');
var EventEmitter2 = require('eventemitter2').EventEmitter2;
var fs = require('fs');
@ -86,6 +87,21 @@ God.executeApp = function executeApp(env, cb) {
if (!env_copy.created_at)
env_copy['created_at'] = Date.now();
var current_user = '';
if (os.userInfo)
try {
current_user = os.userInfo().username;
} catch (err) {
// For the case of unhandled error for uv_os_get_passwd
// https://github.com/Unitech/pm2/issues/3184
current_user = '';
} else {
current_user = process.env.USER || process.env.LNAME || process.env.USERNAME || process.env.SUDO_USER || process.env.C9_USER || process.env.LOGNAME;
}
env_copy['username'] = current_user;
/**
* Enter here when it's the first time that the process is created
* 1 - Assign a new id