parent
85cbf773f0
commit
4d482b765f
|
@ -98,14 +98,19 @@ defp cache_resp(conn, opts) do
|
||||||
content_type = content_type(conn)
|
content_type = content_type(conn)
|
||||||
|
|
||||||
conn =
|
conn =
|
||||||
unless opts[:tracking_fun] do
|
cond do
|
||||||
@cachex.put(:web_resp_cache, key, {content_type, body}, ttl: ttl)
|
Map.get(conn.assigns, :skip_cache, false) ->
|
||||||
conn
|
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)
|
|
||||||
|
|
||||||
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
|
end
|
||||||
|
|
||||||
put_resp_header(conn, "x-cache", "MISS from Pleroma")
|
put_resp_header(conn, "x-cache", "MISS from Pleroma")
|
||||||
|
|
|
@ -179,4 +179,22 @@ test "ignore non-successful responses" 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 New Issue