NanamiAdmin
2a5a46a984
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".
55 lines
1.8 KiB
Go
55 lines
1.8 KiB
Go
package pipes
|
|
|
|
import (
|
|
"net"
|
|
"reflect"
|
|
"testing"
|
|
|
|
gomail "gopkg.in/mail.v2"
|
|
|
|
"nukumizu-backend/config"
|
|
)
|
|
|
|
// dialerIsDefault reports whether gomail still dials directly. Function values
|
|
// are not comparable in Go, so the code pointers are compared instead.
|
|
func dialerIsDefault() bool {
|
|
return reflect.ValueOf(gomail.NetDialTimeout).Pointer() ==
|
|
reflect.ValueOf(net.DialTimeout).Pointer()
|
|
}
|
|
|
|
// TestApplyEmailProxyRestoresDefaultDialer covers the case the constructor used
|
|
// to get wrong. gomail exposes its dial hook as a package-level variable with no
|
|
// unset, and the code only installed the proxy dialer when the flag was set, so
|
|
// turning networkUseProxy back off left SMTP tunnelled through a proxy nobody
|
|
// had asked for — with no way to undo it short of a restart.
|
|
func TestApplyEmailProxyRestoresDefaultDialer(t *testing.T) {
|
|
t.Cleanup(func() { gomail.NetDialTimeout = net.DialTimeout })
|
|
|
|
applyEmailProxy(true)
|
|
if dialerIsDefault() {
|
|
t.Fatal("applyEmailProxy(true) did not install the proxy dialer")
|
|
}
|
|
|
|
applyEmailProxy(false)
|
|
if !dialerIsDefault() {
|
|
t.Error("applyEmailProxy(false) left the proxy dialer in place")
|
|
}
|
|
}
|
|
|
|
// TestNewEmailControllerAppliesProxySetting pins that the dialer follows the
|
|
// settings a controller is built with, which is what makes a rebuilt controller
|
|
// pick up a changed proxy flag.
|
|
func TestNewEmailControllerAppliesProxySetting(t *testing.T) {
|
|
t.Cleanup(func() { gomail.NetDialTimeout = net.DialTimeout })
|
|
|
|
NewEmailController(config.EmailConfig{NetworkUseProxy: true})
|
|
if dialerIsDefault() {
|
|
t.Error("a controller built with networkUseProxy: true did not install the proxy dialer")
|
|
}
|
|
|
|
NewEmailController(config.EmailConfig{NetworkUseProxy: false})
|
|
if !dialerIsDefault() {
|
|
t.Error("a controller rebuilt with networkUseProxy: false left the proxy dialer in place")
|
|
}
|
|
}
|