mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dockerAll() bug fix

Browse Source
This commit is contained in:
Sebastian Hildebrandt
2019-06-19 12:09:18 +02:00
parent ece3ff2652
commit bb15a8ce1b
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/docker.js
+11 -11
View File
@@ -532,17 +532,17 @@ function dockerAll(callback) {
result.forEach(function (element) {
dockerContainerStats(element.id).then(res => {
// include stats in array
element.mem_usage = res.mem_usage;
element.mem_limit = res.mem_limit;
element.mem_percent = res.mem_percent;
element.cpu_percent = res.cpu_percent;
element.pids = res.pids;
element.netIO = res.netIO;
element.blockIO = res.blockIO;
element.cpu_stats = res.cpu_stats;
element.precpu_stats = res.precpu_stats;
element.memory_stats = res.memory_stats;
element.networks = res.networks;
element.mem_usage = res[0].mem_usage;
element.mem_limit = res[0].mem_limit;
element.mem_percent = res[0].mem_percent;
element.cpu_percent = res[0].cpu_percent;
element.pids = res[0].pids;
element.netIO = res[0].netIO;
element.blockIO = res[0].blockIO;
element.cpu_stats = res[0].cpu_stats;
element.precpu_stats = res[0].precpu_stats;
element.memory_stats = res[0].memory_stats;
element.networks = res[0].networks;
dockerContainerProcesses(element.id).then(processes => {
element.processes = processes;
lib/util.js
+1 -1
View File
@@ -37,7 +37,7 @@ const execOptsWin = {
windowsHide: true,
maxBuffer: 1024 * 2000,
encoding: 'UTF-8',
env: util._extend(process.env, { LANG: 'en_US.UTF-8' })
env: util._extend({}.process.env, { LANG: 'en_US.UTF-8' })
};