Skip to content
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

httpcaddyfile: allow modules to customize listener wrappers #3397

Merged
merged 5 commits into from
Jun 1, 2020
Merged

httpcaddyfile: allow modules to customize listener wrappers #3397

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab79180
httpcaddyfile: allow modules to customize listener wrappers
disintegrator May 11, 2020
e77d14b
Update caddyconfig/httpcaddyfile/httptype.go
disintegrator May 12, 2020
39c1d19
Update caddyconfig/httpcaddyfile/httptype.go
disintegrator May 12, 2020
7bfc046
Update caddyconfig/httpcaddyfile/httptype.go
disintegrator May 12, 2020
998db80
Update caddyconfig/httpcaddyfile/httptype.go
disintegrator May 12, 2020
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
14 changes: 14 additions & 0 deletions caddyconfig/httpcaddyfile/httptype.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,20 @@ func (st *ServerType) serversFromPairings(
(addr.Port == httpsPort || (addr.Port != httpPort && addr.Host != ""))
}

// Look for any config values that provide listener wrappers on the server block
for _, listenerConfig := range sblock.pile["listener_wrapper"] {
listenerWrapper, ok := listenerConfig.Value.(caddy.ListenerWrapper)
if !ok {
return nil, fmt.Errorf("config for a listener wrapper did not provide a value that implements caddy.ListenerWrapper")
}
jsonListenerWrapper := caddyconfig.JSONModuleObject(
listenerWrapper,
"wrapper",
listenerWrapper.(caddy.Module).CaddyModule().ID.Name(),
warnings)
srv.ListenerWrappersRaw = append(srv.ListenerWrappersRaw, jsonListenerWrapper)
}

// set up each handler directive, making sure to honor directive order
dirRoutes := sblock.pile["route"]
siteSubroute, err := buildSubroute(dirRoutes, groupCounter)
Expand Down