diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-10 09:17:16 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-10 09:17:16 +0300 |
| commit | b0d0d8f91b242a2975a755f0ddeaec9f016d2d18 (patch) | |
| tree | 681048f2df992934a80ca5e5ad10c3ad17474a66 /lib | |
| parent | aee88d11be898921d79ad7f1481ab055190f4dfd (diff) | |
| parent | b3e6953d23250393010adb01fc604f97fd17eb96 (diff) | |
| download | pleroma-b0d0d8f91b242a2975a755f0ddeaec9f016d2d18.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/healthcheck.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/healthcheck.ex b/lib/pleroma/healthcheck.ex index 8f7f43ec2..92ce83cb7 100644 --- 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() |