diff --git a/internal/app/app.go b/internal/app/app.go index 3ee0d038..b39c5862 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -244,6 +244,14 @@ func run(c *cli.Context) error { } } + logrus.WithFields(logrus.Fields{ + "lastVersion": v.GetLastVersion().String(), + "showAllMail": v.GetShowAllMail(), + "updateCh": v.GetUpdateChannel(), + "rollout": v.GetUpdateRollout(), + "DoH": v.GetProxyAllowed(), + }).Info("Vault loaded") + // Load the cookies from the vault. return withCookieJar(v, func(cookieJar http.CookieJar) error { // Create a new bridge instance. diff --git a/internal/bridge/imap.go b/internal/bridge/imap.go index 760ba6b0..a5d94fe0 100644 --- a/internal/bridge/imap.go +++ b/internal/bridge/imap.go @@ -47,7 +47,10 @@ func (bridge *Bridge) serveIMAP() error { return 0, fmt.Errorf("no IMAP server instance running") } - logrus.Info("Starting IMAP server") + logrus.WithFields(logrus.Fields{ + "port": bridge.vault.GetIMAPPort(), + "ssl": bridge.vault.GetIMAPSSL(), + }).Info("Starting IMAP server") imapListener, err := newListener(bridge.vault.GetIMAPPort(), bridge.vault.GetIMAPSSL(), bridge.tlsConfig) if err != nil { diff --git a/internal/bridge/smtp.go b/internal/bridge/smtp.go index b6d95158..9b88b811 100644 --- a/internal/bridge/smtp.go +++ b/internal/bridge/smtp.go @@ -33,7 +33,10 @@ import ( func (bridge *Bridge) serveSMTP() error { port, err := func() (int, error) { - logrus.Info("Starting SMTP server") + logrus.WithFields(logrus.Fields{ + "port": bridge.vault.GetSMTPPort(), + "ssl": bridge.vault.GetSMTPSSL(), + }).Info("Starting SMTP server") smtpListener, err := newListener(bridge.vault.GetSMTPPort(), bridge.vault.GetSMTPSSL(), bridge.tlsConfig) if err != nil { diff --git a/internal/bridge/user.go b/internal/bridge/user.go index c5c58175..907b8594 100644 --- a/internal/bridge/user.go +++ b/internal/bridge/user.go @@ -399,7 +399,7 @@ func (bridge *Bridge) loadUsers(ctx context.Context) error { return nil } - log.Info("Loading connected user") + log.WithField("mode", user.AddressMode()).Info("Loading connected user") bridge.publish(events.UserLoading{ UserID: user.UserID(), diff --git a/internal/user/sync.go b/internal/user/sync.go index 03515645..d3da5d8f 100644 --- a/internal/user/sync.go +++ b/internal/user/sync.go @@ -262,7 +262,7 @@ func (user *User) syncMessages( syncStartTime := time.Now() defer func() { logrus.WithField("duration", time.Since(syncStartTime)).Info("Message sync completed") }() - logrus.WithFields(logrus.Fields{ + user.log.WithFields(logrus.Fields{ "messages": len(messageIDs), "numCPU": runtime.NumCPU(), }).Info("Starting message sync")