infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-12 17:44:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

use debug logging in tests

Browse Source 
by setting the loglevel to debug in package mlog.
we restore the "info" logging in main.
except for "mox localserve", which still sets debug by default.
This commit is contained in:
Mechiel Lukkien
2024-05-10 15:15:56 +02:00
parent bf8cfd9724
commit 9152384fd3
9 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
localserve.go
View File

@ -120,11 +120,14 @@ during those commands instead of during "data".
existingConfig = true
}
if level, ok := mlog.Levels[loglevel]; loglevel != "" && ok {
mox.Conf.Log[""] = level
mlog.SetConfig(mox.Conf.Log)
} else if loglevel != "" && !ok {
log.Fatal("unknown loglevel", slog.String("loglevel", loglevel))
// For new configs, we keep the "info" loglevel set by writeLocalConfig until after
// initializing database files, to prevent lots of schema upgrade logging.
fallbackLevel := mox.Conf.Static.LogLevel
if fallbackLevel == "" {
fallbackLevel = "debug"
}
if existingConfig {
loadLoglevel(log, fallbackLevel)
}
// Initialize receivedid.
@ -158,6 +161,9 @@ during those commands instead of during "data".
if err := start(mtastsdbRefresher, sendDMARCReports, sendTLSReports, skipForkExec); err != nil {
log.Fatalx("starting mox", err)
}
loadLoglevel(log, fallbackLevel)
golog.Printf("mox, version %s, %s %s/%s", moxvar.Version, runtime.Version(), runtime.GOOS, runtime.GOARCH)
golog.Print("")
golog.Printf("the default user is mox@localhost, with password moxmoxmox")
@ -471,6 +477,9 @@ func writeLocalConfig(log mlog.Log, dir, ip string) (rerr error) {
err = localLoadConfig(log, dir)
xcheck(err, "loading config")
// Info so we don't log lots about initializing database.
loadLoglevel(log, "info")
// Set password on account.
a, _, err := store.OpenEmail(log, "mox@localhost")
xcheck(err, "opening account to set password")
@ -484,6 +493,19 @@ func writeLocalConfig(log mlog.Log, dir, ip string) (rerr error) {
return nil
}
func loadLoglevel(log mlog.Log, fallback string) {
ll := loglevel
if ll == "" {
ll = fallback
}
if level, ok := mlog.Levels[ll]; ok {
mox.Conf.Log[""] = level
mlog.SetConfig(mox.Conf.Log)
} else {
log.Fatal("unknown loglevel", slog.String("loglevel", loglevel))
}
}
func localLoadConfig(log mlog.Log, dir string) error {
mox.ConfigStaticPath = filepath.Join(dir, "mox.conf")
mox.ConfigDynamicPath = filepath.Join(dir, "domains.conf")