From ff01fd3c4fe1edb45098a7730b97b9424b1222cc Mon Sep 17 00:00:00 2001 From: rinpatch Date: Wed, 16 Jan 2019 11:18:25 +0300 Subject: [PATCH] Remove caching because it does not affect performance and may be even worse in some cases --- lib/pleroma/web/metadata.ex | 25 ------------------------- lib/pleroma/web/router.ex | 2 +- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/lib/pleroma/web/metadata.ex b/lib/pleroma/web/metadata.ex index ddc74fb0d..d859dfd8b 100644 --- a/lib/pleroma/web/metadata.ex +++ b/lib/pleroma/web/metadata.ex @@ -2,31 +2,6 @@ defmodule Pleroma.Web.Metadata do alias Phoenix.HTML @providers Pleroma.Config.get([__MODULE__, :providers], []) - def get_cached_tags(%{activity: activity, user: user} = params) do - # We don't need to use the both activity and a user since the object can't change it's content - key = "#{:erlang.term_to_binary(user)}#{activity.data["id"]}" - - Cachex.fetch!(:metadata_cache, key, fn _key -> - {:commit, build_tags(params)} - end) - end - - def get_cached_tags(%{user: user} = params) do - # I am unsure how well ETS works with big keys - key = :erlang.term_to_binary(user) - - Cachex.fetch!(:metadata_cache, key, fn _key -> - {:commit, build_tags(params)} - end) - end - - def get_cached_tags(params) do - key = :erlang.term_to_binary(params) - - Cachex.fetch!(:metadata_cache, key, fn _key -> - {:commit, build_tags(params)} - end) - end def build_tags(params) do Enum.reduce(@providers, "", fn parser, acc -> diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 1ecd4aee1..25e866c48 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -534,7 +534,7 @@ defmodule Fallback.RedirectController do def redirector_with_meta(conn, params) do {:ok, index_content} = File.read(index_file_path()) - tags = Metadata.get_cached_tags(params) + tags = Metadata.build_tags(params) response = String.replace(index_content, "", tags) conn