projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into stable
[akkoma]
/
lib
/
pleroma
/
web
/
plugs
/
cache.ex
diff --git
a/lib/pleroma/web/plugs/cache.ex
b/lib/pleroma/web/plugs/cache.ex
index b0e44db077e022275828132bf85b52a9b9cdc1b0..935b2d83464fb5f2514c92803a81193d1bf66ba8 100644
(file)
--- a/
lib/pleroma/web/plugs/cache.ex
+++ b/
lib/pleroma/web/plugs/cache.ex
@@
-100,19
+100,20
@@
defmodule Pleroma.Web.Plugs.Cache do
should_cache = not Map.get(conn.assigns, :skip_cache, false)
conn =
should_cache = not Map.get(conn.assigns, :skip_cache, false)
conn =
- cond do
- Map.get(conn.assigns, :skip_cache, false) ->
- conn
-
- !opts[:tracking_fun] ->
+ unless opts[:tracking_fun] do
+ if should_cache do
@cachex.put(:web_resp_cache, key, {content_type, body}, ttl: ttl)
@cachex.put(:web_resp_cache, key, {content_type, body}, ttl: ttl)
- conn
+ end
+
+ conn
+ else
+ tracking_fun_data = Map.get(conn.assigns, :tracking_fun_data, nil)
- true ->
- tracking_fun_data = Map.get(conn.assigns, :tracking_fun_data, nil)
+ if should_cache do
@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)
+ end
-
opts.tracking_fun.(conn, tracking_fun_data)
+ opts.tracking_fun.(conn, tracking_fun_data)
end
put_resp_header(conn, "x-cache", "MISS from Pleroma")
end
put_resp_header(conn, "x-cache", "MISS from Pleroma")