refactor(controller): apply controller settings by rebuilding the channel set
Giving each controller a Reload method worked for the notification pipes, which only hold values, but not for the two bot channels: the NapCat client is stopped through a sync.Once and the Telegram polling context is created with the controller, so neither can be re-pointed once running. It also meant five bespoke implementations of the same idea. Replace the whole set instead. Manager.ReplaceAll swaps in a freshly built set under the registry lock, stops the outgoing controllers outside it, and starts the incoming ones off the calling goroutine so a slow handshake does not hold the settings request open. ReplaceAll is now the only way controllers are installed: Register is gone, because a lone registration would slip a controller in without recording the settings it was built from, which is what NeedsRebuild compares against. The rebuild runs from the reload hook and only fires when the controllerMethod section actually changed, so saving a message template or a webhook endpoint leaves the channels alone. NeedsRebuild compares the whole section by value, and a test pins that reloading a file reproduces it exactly — a default applied inconsistently would make every save look like a controller change and tear down every channel. With controllers immutable after construction and replaced wholesale, the atomic pointers and Reload methods have no writers left, so they are gone and the pipes return to plain fields. notifyReload now serializes hook execution for the same reason: a hook mutates process-wide state, and two overlapping settings updates would otherwise each decide to rebuild from their own view of what was applied. Kept from that work: applyEmailProxy restores gomail's default dialer when networkUseProxy is turned off. The old constructor only ever installed the proxy dialer, so switching the flag back left SMTP tunnelled through a proxy with no way to undo it short of a restart. Documents the resulting behaviour in the README under "What applies without a restart".
This commit is contained in:
+10
-2
@@ -16,6 +16,12 @@ import (
|
||||
var (
|
||||
reloadHooksMu sync.Mutex
|
||||
reloadHooks []func(*Config)
|
||||
|
||||
// reloadRunMu serializes hook execution. A hook mutates process-wide state
|
||||
// — the logger's debug flag, the controller registry — so two overlapping
|
||||
// settings updates must not run them at the same time, or both would decide
|
||||
// to rebuild the controllers from their own view of what was applied.
|
||||
reloadRunMu sync.Mutex
|
||||
)
|
||||
|
||||
// OnReload registers a hook to run after every reload of the global
|
||||
@@ -47,13 +53,15 @@ func notifyReload(cfg *Config) {
|
||||
return
|
||||
}
|
||||
|
||||
// Copy under the lock, then run outside it: a hook is free to register
|
||||
// another hook without deadlocking.
|
||||
// Copy under the registry lock, then release it before running anything: a
|
||||
// hook is free to register another hook without deadlocking.
|
||||
reloadHooksMu.Lock()
|
||||
hooks := make([]func(*Config), len(reloadHooks))
|
||||
copy(hooks, reloadHooks)
|
||||
reloadHooksMu.Unlock()
|
||||
|
||||
reloadRunMu.Lock()
|
||||
defer reloadRunMu.Unlock()
|
||||
for _, hook := range hooks {
|
||||
runReloadHook(hook, cfg)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user