diff options
| author | Matthew Holt <mholt@users.noreply.github.com> | 2020-04-13 09:48:54 -0600 |
|---|---|---|
| committer | Matthew Holt <mholt@users.noreply.github.com> | 2020-04-13 09:48:54 -0600 |
| commit | ec456811bb6d61ce32dbe6e4b7580d383f8a4adf (patch) | |
| tree | 4d49b468e1677584f47262aafa849b43133d6603 /caddyconfig | |
| parent | 68cebb28d063a7a71705ce022f118b5e1205fa3f (diff) | |
core: Don't return error on RegisterModule() and RegisterAdapter()
These functions are called at init-time, and their inputs are hard-coded
so there are no environmental or user factors that could make it fail
or succeed; the error return values are often ignored, and when they're
not, they are usually a fatal error anyway. To ensure that a programmer
mistake is not missed, we now panic instead.
Last breaking change 🤞
Diffstat (limited to 'caddyconfig')
| -rw-r--r-- | caddyconfig/configadapters.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/caddyconfig/configadapters.go b/caddyconfig/configadapters.go index 96d7e10..2c466c4 100644 --- a/caddyconfig/configadapters.go +++ b/caddyconfig/configadapters.go @@ -101,13 +101,14 @@ func JSONIndent(val interface{}) ([]byte, error) { } // RegisterAdapter registers a config adapter with the given name. -// This should usually be done at init-time. -func RegisterAdapter(name string, adapter Adapter) error { +// This should usually be done at init-time. It panics if the +// adapter cannot be registered successfully. +func RegisterAdapter(name string, adapter Adapter) { if _, ok := configAdapters[name]; ok { - return fmt.Errorf("%s: already registered", name) + panic(fmt.Errorf("%s: already registered", name)) } configAdapters[name] = adapter - return caddy.RegisterModule(adapterModule{name, adapter}) + caddy.RegisterModule(adapterModule{name, adapter}) } // GetAdapter returns the adapter with the given name, |