pleroma

commit: c962c6afb3b30eb6d42c2a5548898b3713492169
parent: df82ee417916b4c1572c4c3403566cf19ff68ee4
Author: lain <lain@soykaf.club>
Date:   Sat,  9 May 2020 08:10:56 +0000

Merge branch 'fix/healthcheck-total-alloc' into 'develop'

healthcheck: report real amount of memory allocated by beam

See merge request pleroma/pleroma!2499
Diffstat:
M
CHANGELOG.md
3
+++
M
lib/pleroma/healthcheck.ex
2
+-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,6 +42,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased (patch)]
 
+### Fixed
+- Healthcheck reporting the number of memory currently used, rather than allocated in total
+
 ## [2.0.3] - 2020-05-02
 
 ### Security
diff --git a/lib/pleroma/healthcheck.ex b/lib/pleroma/healthcheck.ex
@@ -29,7 +29,7 @@ defmodule Pleroma.Healthcheck do
   @spec system_info() :: t()
   def system_info do
     %Healthcheck{
-      memory_used: Float.round(:erlang.memory(:total) / 1024 / 1024, 2)
+      memory_used: Float.round(:recon_alloc.memory(:allocated) / 1024 / 1024, 2)
     }
     |> assign_db_info()
     |> assign_job_queue_stats()