Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-17 14:37:02 +00:00
Code Releases Activity

domaininfo: Do not reload the database periodically

Browse Source 
It is not expected that the user modifies the domaininfo database behind
chasquid's back, and reloading it can be somewhat expensive.

So this patch removes the periodic reload, and instead makes it triggered
by SIGHUP so the user can trigger a reload manually if needed.
This commit is contained in:
Alberto Bertogli
2023-07-27 23:31:29 +01:00
parent ad0dbb9cda
commit 2b7e33a615
3 changed files with 47 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
internal/smtpsrv/server.go
View File

@@ -138,15 +138,9 @@ func (s *Server) SetAliasesConfig(suffixSep, dropChars string) {
s.aliasesR.ResolveHook = path.Join(s.HookPath, "alias-resolve")
}
// InitDomainInfo initializes the domain info database.
func (s *Server) InitDomainInfo(dir string) *domaininfo.DB {
var err error
s.dinfo, err = domaininfo.New(dir)
if err != nil {
log.Fatalf("Error opening domain info database: %v", err)
}
return s.dinfo
// SetDomainInfo sets the domain info database to use.
func (s *Server) SetDomainInfo(dinfo *domaininfo.DB) {
s.dinfo = dinfo
}
// InitQueue initializes the queue.
@@ -168,8 +162,8 @@ func (s *Server) InitQueue(path string, localC, remoteC courier.Courier) {
})
}
// periodicallyReload some of the server's information, such as aliases and
// the user databases.
// periodicallyReload some of the server's information that can be changed
// without the server knowing, such as aliases and the user databases.
func (s *Server) periodicallyReload() {
if reloadEvery == nil {
return
@@ -177,20 +171,20 @@ func (s *Server) periodicallyReload() {
//lint:ignore SA1015 This lasts the program's lifetime.
for range time.Tick(*reloadEvery) {
err := s.aliasesR.Reload()
if err != nil {
log.Errorf("Error reloading aliases: %v", err)
}
s.Reload()
}
}
err = s.authr.Reload()
if err != nil {
log.Errorf("Error reloading authenticators: %v", err)
}
func (s *Server) Reload() {
// Note that any error while reloading is fatal: this way, if there is an
// unexpected error it can be detected (and corrected) quickly, instead of
// much later (e.g. upon restart) when it might be harder to debug.
if err := s.aliasesR.Reload(); err != nil {
log.Fatalf("Error reloading aliases: %v", err)
}
err = s.dinfo.Reload()
if err != nil {
log.Errorf("Error reloading domaininfo: %v", err)
}
if err := s.authr.Reload(); err != nil {
log.Fatalf("Error reloading authenticators: %v", err)
}
}

9
internal/smtpsrv/server_test.go
View File

@@ -11,6 +11,7 @@ import (
"time"
"blitiri.com.ar/go/chasquid/internal/aliases"
"blitiri.com.ar/go/chasquid/internal/domaininfo"
"blitiri.com.ar/go/chasquid/internal/maillog"
"blitiri.com.ar/go/chasquid/internal/testlib"
"blitiri.com.ar/go/chasquid/internal/userdb"
@@ -593,7 +594,13 @@ func realMain(m *testing.M) int {
s.AddAddr(submissionTLSAddr, ModeSubmissionTLS)
s.InitQueue(tmpDir+"/queue", localC, remoteC)
s.InitDomainInfo(tmpDir + "/domaininfo")
dinfo, err := domaininfo.New(tmpDir + "/domaininfo")
if err != nil {
fmt.Printf("Error initializing domaininfo: %v", err)
return 1
}
s.SetDomainInfo(dinfo)
udb := userdb.New("/dev/null")
udb.AddUser("testuser", "testpasswd")