From ec456811bb6d61ce32dbe6e4b7580d383f8a4adf Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Mon, 13 Apr 2020 09:48:54 -0600 Subject: core: Don't return error on RegisterModule() and RegisterAdapter() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 🤞 --- caddyconfig/configadapters.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'caddyconfig/configadapters.go') 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, -- cgit v1.2.3