sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow to skip cache in Cache plug 

Ref: fix-local-public
This commit is contained in:
Tusooa Zhu 2022-05-05 18:39:34 -04:00 committed by Haelwenn (lanodan) Monnier
parent c3b2b71ea2
commit e2d24eda57
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/pleroma/web/plugs/cache.ex
View File

@ -98,14 +98,19 @@ defmodule Pleroma.Web.Plugs.Cache do
content_type = content_type(conn)
conn =
unless opts[:tracking_fun] do
@cachex.put(:web_resp_cache, key, {content_type, body}, ttl: ttl)
conn
else
tracking_fun_data = Map.get(conn.assigns, :tracking_fun_data, nil)
@cachex.put(:web_resp_cache, key, {content_type, body, tracking_fun_data}, ttl: ttl)
cond do
Map.get(conn.assigns, :skip_cache, false) ->
conn
opts.tracking_fun.(conn, tracking_fun_data)
!opts[:tracking_fun] ->
@cachex.put(:web_resp_cache, key, {content_type, body}, ttl: ttl)
conn
true ->
tracking_fun_data = Map.get(conn.assigns, :tracking_fun_data, nil)
@cachex.put(:web_resp_cache, key, {content_type, body, tracking_fun_data}, ttl: ttl)
opts.tracking_fun.(conn, tracking_fun_data)
end
put_resp_header(conn, "x-cache", "MISS from Pleroma")

18
test/pleroma/web/plugs/cache_test.exs
View File

@ -179,4 +179,22 @@ defmodule Pleroma.Web.Plugs.CacheTest do
|> send_resp(:im_a_teapot, "🥤")
|> sent_resp()
end
test "ignores if skip_cache is assigned" do
assert @miss_resp ==
conn(:get, "/")
|> assign(:skip_cache, true)
|> Cache.call(%{query_params: false, ttl: nil})
|> put_resp_content_type("cofe/hot")
|> send_resp(:ok, "cofe")
|> sent_resp()
assert @miss_resp ==
conn(:get, "/")
|> assign(:skip_cache, true)
|> Cache.call(%{query_params: false, ttl: nil})
|> put_resp_content_type("cofe/hot")
|> send_resp(:ok, "cofe")
|> sent_resp()
end
end