Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding

2020-05-10 09:17:16 +03:00 · 2020-05-10 09:17:16 +03:00 · b0d0d8f91b
commit b0d0d8f91b
parent aee88d11be b3e6953d23
27 changed files with 69 additions and 30 deletions
--- 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()