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

aliases: Add files unconditionally, to allow for reloads

Browse Source 
Today, if the aliases file does not exist when chasquid starts up, the entire
domain will be skipped from aliases resolution.

That's a bug, as it means we don't perform character and suffix replacements
for known domains, and is also an inconvenience as it forces us to reload the
daemon when adding a file for a known domain.

This patch fixes this by adding them unconditionally, even if the file does
not exist.
This commit is contained in:
Alberto Bertogli
2016-09-25 20:33:54 +01:00
parent 469cbd5d76
commit a5ea6c9ba0
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
chasquid.go
View File

@@ -159,13 +159,11 @@ func loadDomain(name, dir string, s *Server, aliasesR *aliases.Resolver) {
}
}
if _, err := os.Stat(dir + "/aliases"); err == nil {
glog.Infof(" adding aliases")
err := aliasesR.AddAliasesFile(name, dir+"/aliases")
if err != nil {
glog.Errorf(" error: %v", err)
}
}
}
// Flush logs periodically, to help troubleshooting if there isn't that much
@@ -276,7 +274,7 @@ func (s *Server) InitQueue(path string, aliasesR *aliases.Resolver,
// Launch the periodic reload of aliases, now that the queue may care
// about them.
go func() {
for range time.Tick(1 * time.Minute) {
for range time.Tick(30 * time.Second) {
err := aliasesR.Reload()
if err != nil {
glog.Errorf("Error reloading aliases: %v")

21
internal/aliases/aliases.go
View File

@@ -173,16 +173,26 @@ func (v *Resolver) AddDomain(domain string) {
}
func (v *Resolver) AddAliasesFile(domain, path string) error {
// We inconditionally add the domain and file on our list.
// Even if the file does not exist now, it may later. This makes it be
// consider when doing Reload.
// Adding it to the domains mean that we will do drop character and suffix
// manipulation even if there are no aliases for it.
v.mu.Lock()
v.files[domain] = append(v.files[domain], path)
v.domains[domain] = true
v.mu.Unlock()
aliases, err := parseFile(domain, path)
if os.IsNotExist(err) {
return nil
}
if err != nil {
return err
}
v.mu.Lock()
v.files[domain] = append(v.files[domain], path)
v.domains[domain] = true
// Add the aliases to the resolver, overriding any previous values.
v.mu.Lock()
for addr, rs := range aliases {
v.aliases[addr] = rs
}
@@ -201,6 +211,9 @@ func (v *Resolver) Reload() error {
for domain, paths := range v.files {
for _, path := range paths {
aliases, err := parseFile(domain, path)
if os.IsNotExist(err) {
continue
}
if err != nil {
return fmt.Errorf("Error parsing %q: %v", path, err)
}