sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove caching because it does not affect performance and may be even worse in some cases

Browse Source
This commit is contained in:
rinpatch 2019-01-16 11:18:25 +03:00
parent 8cea00e1dc
commit ff01fd3c4f
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/pleroma/web/metadata.ex
View File

@ -2,31 +2,6 @@ defmodule Pleroma.Web.Metadata do
alias Phoenix.HTML alias Phoenix.HTML
@providers Pleroma.Config.get([__MODULE__, :providers], []) @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 def build_tags(params) do
Enum.reduce(@providers, "", fn parser, acc -> Enum.reduce(@providers, "", fn parser, acc ->

2
lib/pleroma/web/router.ex
View File

@ -534,7 +534,7 @@ def redirector_with_meta(conn, %{"maybe_nickname_or_id" => maybe_nickname_or_id}
def redirector_with_meta(conn, params) do def redirector_with_meta(conn, params) do
{:ok, index_content} = File.read(index_file_path()) {:ok, index_content} = File.read(index_file_path())
tags = Metadata.get_cached_tags(params) tags = Metadata.build_tags(params)
response = String.replace(index_content, "<!--server-generated-meta-->", tags) response = String.replace(index_content, "<!--server-generated-meta-->", tags)
conn conn