github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-28 22:55:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

caddyfile: Refactor unmarshaling of module tokens

Browse Source 
Eliminates a fair amount of repeated code
This commit is contained in:
Matthew Holt
2021-01-05 14:39:30 -07:00
parent b1bec8c899
commit f0216967dc
9 changed files with 90 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/caddyhttp/encode/caddyfile.go
View File

@ -64,21 +64,14 @@ func (enc *Encode) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
for d.NextBlock(0) {
name := d.Val()
mod, err := caddy.GetModule("http.encoders." + name)
if err != nil {
return fmt.Errorf("getting encoder module '%s': %v", name, err)
}
unm, ok := mod.New().(caddyfile.Unmarshaler)
if !ok {
return fmt.Errorf("encoder module '%s' is not a Caddyfile unmarshaler", mod)
}
err = unm.UnmarshalCaddyfile(d.NewFromNextSegment())
modID := "http.encoders." + name
unm, err := caddyfile.UnmarshalModule(d, modID)
if err != nil {
return err
}
encoding, ok := unm.(Encoding)
if !ok {
return fmt.Errorf("module %s is not an HTTP encoding", mod)
return fmt.Errorf("module %s is not an HTTP encoding; is %T", modID, unm)
}
if enc.EncodingsRaw == nil {
enc.EncodingsRaw = make(caddy.ModuleMap)