mirror of
https://github.com/caddyserver/caddy.git
synced 2026-01-17 01:30:34 +00:00
Refactor Caddyfile adapter and module registration
Use piles from which to draw config values. Module values can return their name, so now we can do two-way mapping from value to name and name to value; whereas before we could only map name to value. This was problematic with the Caddyfile adapter since it receives values and needs to know the name to put in the config.
This commit is contained in:
11
context.go
11
context.go
@@ -99,11 +99,16 @@ func (ctx Context) LoadModule(name string, rawMsg json.RawMessage) (interface{},
|
||||
return nil, fmt.Errorf("module '%s' has no constructor", mod.Name)
|
||||
}
|
||||
|
||||
val := mod.New()
|
||||
val := mod.New().(interface{})
|
||||
|
||||
// value must be a pointer for unmarshaling into concrete type
|
||||
// value must be a pointer for unmarshaling into concrete type, even if
|
||||
// the module's concrete type is a slice or map; New() *should* return
|
||||
// a pointer, otherwise unmarshaling errors or panics will occur
|
||||
if rv := reflect.ValueOf(val); rv.Kind() != reflect.Ptr {
|
||||
val = reflect.New(rv.Type()).Elem().Addr().Interface()
|
||||
log.Printf("[WARNING] ModuleInfo.New() for module '%s' did not return a pointer,"+
|
||||
" so we are using reflection to make a pointer instead; please fix this by"+
|
||||
" using new(Type) or &Type notation in your module's New() function.", name)
|
||||
val = reflect.New(rv.Type()).Elem().Addr().Interface().(Module)
|
||||
}
|
||||
|
||||
// fill in its config only if there is a config to fill in
|
||||
|
||||
Reference in New Issue
Block a user