Skip to content

fix: FromApp inherits the app-level api {} config into site handlers #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jtelo88 wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −0
Open

fix: FromApp inherits the app-level api {} config into site handlers #142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions httpcache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,17 @@ func (s *SouinCaddyMiddleware) FromApp(app *SouinApp) error {
}
}

// The Caddyfile `api {}` block is global-only (parseCaddyfileGlobalOption
// rejects it inside site blocks), so a handler's own configuration can
// only carry an API config via raw JSON. When it doesn't, inherit the
// app-level API like every other app-level default merged below —
// otherwise GenerateHandlerMap sees a zero API config in every handler
// instance and the souin API is unreachable in-band on any listener
// (requests fall through the cache handler as if the API didn't exist).
if !s.Configuration.API.Souin.Enable && !s.Configuration.API.Debug.Enable && !s.Configuration.API.Prometheus.Enable {
s.Configuration.API = app.API
}

if app.GetTTL() == 0 {
if s.Configuration.DefaultCache.GetTTL() == 0 {
app.TTL = configurationtypes.Duration{Duration: 120 * time.Second}
Expand Down