diff --git a/cmd/showbridge/main.go b/cmd/showbridge/main.go index 836df73..032d839 100644 --- a/cmd/showbridge/main.go +++ b/cmd/showbridge/main.go @@ -263,7 +263,7 @@ func (app *showbridgeApp) handleChannels() { app.routerMutex.Unlock() continue } - err, moduleErrors, routeErrors := app.router.UpdateConfig(config, false) + moduleErrors, routeErrors, err := app.router.UpdateConfig(config, false) if err != nil { app.logger.Error("failed to update router config", "error", err) app.routerMutex.Unlock() diff --git a/config.go b/config.go index e6d829e..2825ce9 100644 --- a/config.go +++ b/config.go @@ -15,9 +15,9 @@ func (r *Router) GetRunningConfig() config.Config { return r.runningConfig } -func (r *Router) UpdateConfig(newConfig config.Config, triggerChangeChan bool) (error, []config.ModuleError, []config.RouteError) { +func (r *Router) UpdateConfig(newConfig config.Config, triggerChangeChan bool) ([]config.ModuleError, []config.RouteError, error) { if !r.runningConfigMu.TryLock() { - return errors.New("config update in progress"), nil, nil + return nil, nil, errors.New("config update in progress") } defer r.runningConfigMu.Unlock() oldConfig := r.runningConfig @@ -81,5 +81,5 @@ func (r *Router) UpdateConfig(newConfig config.Config, triggerChangeChan bool) ( r.ConfigChange <- newConfig } - return nil, moduleErrors, routeErrors + return moduleErrors, routeErrors, nil } diff --git a/internal/config/config.go b/internal/config/config.go index a2e76ad..9cbf4aa 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -7,6 +7,6 @@ type Config struct { } type Configurable interface { - UpdateConfig(newConfig Config, triggerChangeChannel bool) (error, []ModuleError, []RouteError) + UpdateConfig(newConfig Config, triggerChangeChannel bool) ([]ModuleError, []RouteError, error) GetRunningConfig() Config }