2 Commits

Author SHA1 Message Date
299e50cbf7 2.0.3 2023-07-02 22:23:47 +02:00
1e6af24df0 fix(core): update 2023-07-02 22:23:46 +02:00
4 changed files with 8 additions and 7 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "@pushrocks/smartmetrics", "name": "@pushrocks/smartmetrics",
"version": "2.0.2", "version": "2.0.3",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@pushrocks/smartmetrics", "name": "@pushrocks/smartmetrics",
"version": "2.0.2", "version": "2.0.3",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@pushrocks/smartdelay": "^2.0.13", "@pushrocks/smartdelay": "^2.0.13",

View File

@ -1,6 +1,6 @@
{ {
"name": "@pushrocks/smartmetrics", "name": "@pushrocks/smartmetrics",
"version": "2.0.2", "version": "2.0.3",
"private": false, "private": false,
"description": "easy system metrics", "description": "easy system metrics",
"main": "dist_ts/index.js", "main": "dist_ts/index.js",

View File

@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@pushrocks/smartmetrics', name: '@pushrocks/smartmetrics',
version: '2.0.2', version: '2.0.3',
description: 'easy system metrics' description: 'easy system metrics'
} }

View File

@ -34,8 +34,10 @@ export class SmartMetrics {
// Ignore - this will fail if not running in a Docker container // Ignore - this will fail if not running in a Docker container
} }
this.maxMemoryMB = Math.min(totalSystemMemoryMB, dockerMemoryLimitMB); // Set the maximum memory to the lower value between the Docker limit and the total system memory
this.maxMemoryMB = Math.min(totalSystemMemoryMB, dockerMemoryLimitMB, maxHeapSizeMB);
// If the maximum old space size limit is greater than the maximum available memory, throw an error
if (maxHeapSizeMB > this.maxMemoryMB) { if (maxHeapSizeMB > this.maxMemoryMB) {
throw new Error('Node.js process can use more memory than is available'); throw new Error('Node.js process can use more memory than is available');
} }
@ -88,7 +90,6 @@ export class SmartMetrics {
memoryUsageBytes += stats[stat].memory; memoryUsageBytes += stats[stat].memory;
} }
// Correct memory usage percentage calculation
let memoryPercentage = Math.round((memoryUsageBytes / (this.maxMemoryMB * 1024 * 1024)) * 100 * 100) / 100; let memoryPercentage = Math.round((memoryUsageBytes / (this.maxMemoryMB * 1024 * 1024)) * 100 * 100) / 100;
let memoryUsageText = `${memoryPercentage}% | ${this.formatBytes(memoryUsageBytes)} / ${this.formatBytes(this.maxMemoryMB * 1024 * 1024)}`; let memoryUsageText = `${memoryPercentage}% | ${this.formatBytes(memoryUsageBytes)} / ${this.formatBytes(this.maxMemoryMB * 1024 * 1024)}`;