From 008c5614af37374a4aa84cf079550caa89d16db2 Mon Sep 17 00:00:00 2001
From: thom <thom@amsterdamtech.nl>
Date: Mon, 10 Aug 2020 21:09:22 +0200
Subject: [PATCH 1/3] Show memory usage in MB's (#3651)

---
 interface/lib/classes/tools_monitor.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/interface/lib/classes/tools_monitor.inc.php b/interface/lib/classes/tools_monitor.inc.php
index ce3ffca1eb..b8785e4fcc 100644
--- a/interface/lib/classes/tools_monitor.inc.php
+++ b/interface/lib/classes/tools_monitor.inc.php
@@ -184,9 +184,10 @@ class tools_monitor {
 
 			foreach($data as $key => $value) {
 				if ($key != '') {
+					$memory = number_format($value / 1048576);
 					$html .= '<tr>
                         <td>' . $key . ':</td>
-                        <td>' . $value . '</td>
+                        <td>' . $memory . 'MB (' . $value . ')</td>
                         </tr>';
 				}
 			}
-- 
GitLab


From 773b03f8ac50b3f6d0acc6db19d7e963f22b94c1 Mon Sep 17 00:00:00 2001
From: thom <thom@amsterdamtech.nl>
Date: Tue, 11 Aug 2020 17:01:54 +0200
Subject: [PATCH 2/3] Show memory usage only in MB's (#3651)

---
 interface/lib/classes/tools_monitor.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/lib/classes/tools_monitor.inc.php b/interface/lib/classes/tools_monitor.inc.php
index b8785e4fcc..9bf4e861de 100644
--- a/interface/lib/classes/tools_monitor.inc.php
+++ b/interface/lib/classes/tools_monitor.inc.php
@@ -187,7 +187,7 @@ class tools_monitor {
 					$memory = number_format($value / 1048576);
 					$html .= '<tr>
                         <td>' . $key . ':</td>
-                        <td>' . $memory . 'MB (' . $value . ')</td>
+                        <td>' . $memory . ' MB</td>
                         </tr>';
 				}
 			}
-- 
GitLab


From 1decafcb9eb4e61c6b750b6665ba0262bcd03f30 Mon Sep 17 00:00:00 2001
From: thom <thom@amsterdamtech.nl>
Date: Tue, 25 Aug 2020 23:30:44 +0200
Subject: [PATCH 3/3] Use formatBytes for MemUsage (#3651)

---
 interface/lib/classes/tools_monitor.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/lib/classes/tools_monitor.inc.php b/interface/lib/classes/tools_monitor.inc.php
index 9bf4e861de..435ee220a8 100644
--- a/interface/lib/classes/tools_monitor.inc.php
+++ b/interface/lib/classes/tools_monitor.inc.php
@@ -184,10 +184,10 @@ class tools_monitor {
 
 			foreach($data as $key => $value) {
 				if ($key != '') {
-					$memory = number_format($value / 1048576);
+					$memory = $app->functions->formatBytes($value);
 					$html .= '<tr>
                         <td>' . $key . ':</td>
-                        <td>' . $memory . ' MB</td>
+                        <td>' . $memory . '</td>
                         </tr>';
 				}
 			}
-- 
GitLab