mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 08:36:29 +00:00
Allow to skip cache in Cache plug
Ref: fix-local-public
This commit is contained in:
parent
85cbf773f0
commit
4d482b765f
2 changed files with 30 additions and 7 deletions
|
@ -98,10 +98,15 @@ defmodule Pleroma.Web.Plugs.Cache do
|
||||||
content_type = content_type(conn)
|
content_type = content_type(conn)
|
||||||
|
|
||||||
conn =
|
conn =
|
||||||
unless opts[:tracking_fun] do
|
cond do
|
||||||
|
Map.get(conn.assigns, :skip_cache, false) ->
|
||||||
|
conn
|
||||||
|
|
||||||
|
!opts[:tracking_fun] ->
|
||||||
@cachex.put(:web_resp_cache, key, {content_type, body}, ttl: ttl)
|
@cachex.put(:web_resp_cache, key, {content_type, body}, ttl: ttl)
|
||||||
conn
|
conn
|
||||||
else
|
|
||||||
|
true ->
|
||||||
tracking_fun_data = Map.get(conn.assigns, :tracking_fun_data, nil)
|
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)
|
@cachex.put(:web_resp_cache, key, {content_type, body, tracking_fun_data}, ttl: ttl)
|
||||||
|
|
||||||
|
|
|
@ -179,4 +179,22 @@ defmodule Pleroma.Web.Plugs.CacheTest do
|
||||||
|> send_resp(:im_a_teapot, "🥤")
|
|> send_resp(:im_a_teapot, "🥤")
|
||||||
|> sent_resp()
|
|> sent_resp()
|
||||||
end
|
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
|
end
|
||||||
|
|
Loading…
Reference in a new issue