getDynamicData() fixed windows WSL issue

This commit is contained in:
Sebastian Hildebrandt
2021-02-06 11:26:51 +01:00
parent aae4b37442
commit 06da4917bb
8 changed files with 49 additions and 13 deletions
+17 -4
View File
@@ -196,11 +196,24 @@ function fsOpenFiles(callback) {
if (!result.available) { result.available = result.max - result.allocated; }
}
}
if (callback) {
callback(result);
}
resolve(result);
} else {
fs.readFile('/proc/sys/fs/file-max', function (error, stdout) {
if (!error) {
let lines = stdout.toString().split('\n');
if (lines[0]) {
result.max = parseInt(lines[0], 10);
}
}
if (callback) {
callback(result);
}
resolve(result);
});
}
if (callback) {
callback(result);
}
resolve(result);
});
}
if (_sunos) {
+6 -4
View File
@@ -186,7 +186,7 @@ function services(srv, callback) {
}
result.push({
name: srv,
// running: (allSrv.length && singleSrv.length && singleSrv[0].running !== null ? singleSrv[0].running : ps.length > 0),
// running: (allSrv.length && singleSrv.length && singleSrv[0].running !== null ? singleSrv[0].running : ps.length > 0),
running: ps.length > 0,
startmode: '',
pids: pids,
@@ -305,10 +305,11 @@ function services(srv, callback) {
if (serviceSections[i].trim() !== '') {
let lines = serviceSections[i].trim().split('\r\n');
let srvName = util.getValue(lines, 'Name', '=', true).toLowerCase();
let srvCaption = util.getValue(lines, 'Caption', '=', true).toLowerCase();
let started = util.getValue(lines, 'Started', '=', true);
let startMode = util.getValue(lines, 'StartMode', '=', true);
let pid = util.getValue(lines, 'ProcessId', '=', true);
if (srvString === '*' || srvs.indexOf(srvName) >= 0) {
if (srvString === '*' || srvs.indexOf(srvName) >= 0 || srvs.indexOf(srvCaption) >= 0) {
result.push({
name: srvName,
running: (started === 'TRUE'),
@@ -318,6 +319,7 @@ function services(srv, callback) {
mem: 0
});
dataSrv.push(srvName);
dataSrv.push(srvCaption);
}
}
}
@@ -358,8 +360,8 @@ function services(srv, callback) {
}
}
} else {
if (callback) { callback({}); }
resolve({});
if (callback) { callback([]); }
resolve([]);
}
});
});
+10
View File
@@ -16,6 +16,7 @@
const exec = require('child_process').exec;
const execSync = require('child_process').execSync;
const fs = require('fs');
const os = require('os');
const util = require('./util');
let _platform = process.platform;
@@ -120,6 +121,15 @@ function system(callback) {
util.noop();
}
}
if (!result.virtual && os.version().toLowerCase().indexOf('microsoft') >= 0) {
let versionStr = os.version().toLowerCase();
versionStr = versionStr.split('-')[0].replace('#', '');
const version = parseInt(versionStr, 10) || null;
result.virtual = true;
result.manufacturer = 'Microsoft';
result.model = 'WSL';
result.version = version;
}
if ((_freebsd || _openbsd || _netbsd) && !result.virtualHost) {
try {
const procInfo = execSync('dmidecode -t 4');
+5
View File
@@ -251,6 +251,11 @@ function wifiNetworks(callback) {
}
resolve(result);
}
} else {
if (callback) {
callback(result);
}
resolve(result);
}
} catch (e) {
if (callback) {