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

graphics() fixed parsing (mac OS)

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2023-06-22 21:27:44 +02:00
parent 6268cb7017
commit f37d14b8c4
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -82,6 +82,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
| Version | Date | Comment | | Version | Date | Comment |
| ------- | ---------- | --------------------------------------------------------------------------------------------------- | | ------- | ---------- | --------------------------------------------------------------------------------------------------- |
| 5.18.4 | 2023-06-22 | `graphics()` fixed parsing (mac OS) |
| 5.18.3 | 2023-06-09 | `tests` improved key handling, updated docs | | 5.18.3 | 2023-06-09 | `tests` improved key handling, updated docs |
| 5.18.2 | 2023-06-08 | `fsSize()` improved error handling (linux alpine) | | 5.18.2 | 2023-06-08 | `fsSize()` improved error handling (linux alpine) |
| 5.18.1 | 2023-06-07 | `networkInterfaces()` cleaned up testVirtualNic | | 5.18.1 | 2023-06-07 | `networkInterfaces()` cleaned up testVirtualNic |

5
docs/history.html
View File

@ -57,6 +57,11 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr>
<th scope="row">5.18.4</th>
<td>2023-06-22</td>
<td><span class="code">graphics()</span> fixed parsing (mac OS)</td>
</tr>
<tr> <tr>
<th scope="row">5.18.3</th> <th scope="row">5.18.3</th>
<td>2023-06-09</td> <td>2023-06-09</td>

2
docs/index.html
View File

@ -170,7 +170,7 @@
<img class="logo" src="assets/logo.png" alt="logo"> <img class="logo" src="assets/logo.png" alt="logo">
<div class="title">systeminformation</div> <div class="title">systeminformation</div>
<div class="subtitle"><span id="typed"></span>&nbsp;</div> <div class="subtitle"><span id="typed"></span>&nbsp;</div>
<div class="version">New Version: <span id="version">5.18.3</span></div> <div class="version">New Version: <span id="version">5.18.4</span></div>
<button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button> <button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button>
</div> </div>
<div class="down"> <div class="down">

4
lib/docker.js
View File

@ -484,7 +484,7 @@ function dockerContainerStats(containerIDs, callback) {
containerArray = []; containerArray = [];
dockerContainers().then(allContainers => { dockerContainers().then(allContainers => {
for (let container of allContainers) { for (let container of allContainers) {
containerArray.push(container.id); containerArray.push(container.id.substring(0, 12));
} }
if (containerArray.length) { if (containerArray.length) {
dockerContainerStats(containerArray.join(',')).then(result => { dockerContainerStats(containerArray.join(',')).then(result => {
@ -555,8 +555,8 @@ function dockerContainerStatsSingle(containerID) {
_docker_socket.getStats(containerID, data => { _docker_socket.getStats(containerID, data => {
try { try {
let stats = data; let stats = data;
if (!stats.message) { if (!stats.message) {
if (data.id) { result.id = data.id; }
result.memUsage = (stats.memory_stats && stats.memory_stats.usage ? stats.memory_stats.usage : 0); result.memUsage = (stats.memory_stats && stats.memory_stats.usage ? stats.memory_stats.usage : 0);
result.memLimit = (stats.memory_stats && stats.memory_stats.limit ? stats.memory_stats.limit : 0); result.memLimit = (stats.memory_stats && stats.memory_stats.limit ? stats.memory_stats.limit : 0);
result.memPercent = (stats.memory_stats && stats.memory_stats.usage && stats.memory_stats.limit ? stats.memory_stats.usage / stats.memory_stats.limit * 100.0 : 0); result.memPercent = (stats.memory_stats && stats.memory_stats.usage && stats.memory_stats.limit ? stats.memory_stats.usage / stats.memory_stats.limit * 100.0 : 0);