diff options
author | Robin Jarry <robin@jarry.cc> | 2022-11-27 11:29:34 +0100 |
---|---|---|
committer | Robin Jarry <robin@jarry.cc> | 2022-12-02 22:10:49 +0100 |
commit | 23a05d17ac1d23466ff73efa19576d43d06efe4b (patch) | |
tree | 49986587a62bdd89eb06ffa2aadf05f6d45cb3e7 /config | |
parent | 70f46757449c8f24b818f4dfc5dcb87da7e327d6 (diff) | |
download | aerc-23a05d17ac1d23466ff73efa19576d43d06efe4b.tar.gz |
logging: rename package to log
Use the same name than the builtin "log" package. That way, we do not
risk logging in the wrong place.
Suggested-by: Tim Culverhouse <tim@timculverhouse.com>
Signed-off-by: Robin Jarry <robin@jarry.cc>
Tested-by: Bence Ferdinandy <bence@ferdinandy.com>
Acked-by: Tim Culverhouse <tim@timculverhouse.com>
Diffstat (limited to 'config')
-rw-r--r-- | config/accounts.go | 6 | ||||
-rw-r--r-- | config/binds.go | 8 | ||||
-rw-r--r-- | config/compose.go | 4 | ||||
-rw-r--r-- | config/filters.go | 4 | ||||
-rw-r--r-- | config/general.go | 22 | ||||
-rw-r--r-- | config/openers.go | 4 | ||||
-rw-r--r-- | config/statusline.go | 4 | ||||
-rw-r--r-- | config/templates.go | 4 | ||||
-rw-r--r-- | config/triggers.go | 6 | ||||
-rw-r--r-- | config/ui.go | 6 | ||||
-rw-r--r-- | config/viewer.go | 4 |
11 files changed, 36 insertions, 36 deletions
diff --git a/config/accounts.go b/config/accounts.go index b33bdf09..61f0e282 100644 --- a/config/accounts.go +++ b/config/accounts.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "git.sr.ht/~rjarry/aerc/logging" + "git.sr.ht/~rjarry/aerc/log" "github.com/go-ini/ini" ) @@ -112,7 +112,7 @@ func (config *AercConfig) parseAccounts(root string, accts []string) error { } } - logging.Debugf("Parsing accounts configuration from %s", filename) + log.Debugf("Parsing accounts configuration from %s", filename) file, err := ini.Load(filename) if err != nil { @@ -216,7 +216,7 @@ func (config *AercConfig) parseAccounts(root string, accts []string) error { return fmt.Errorf("Invalid outgoing credentials for %s: %w", _sec, err) } - logging.Debugf("accounts.conf: [%s] from = %s", account.Name, account.From) + log.Debugf("accounts.conf: [%s] from = %s", account.Name, account.From) config.Accounts = append(config.Accounts, account) } if len(accts) > 0 { diff --git a/config/binds.go b/config/binds.go index 281aebf6..6ddeb1e1 100644 --- a/config/binds.go +++ b/config/binds.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "git.sr.ht/~rjarry/aerc/logging" + "git.sr.ht/~rjarry/aerc/log" "github.com/gdamore/tcell/v2" "github.com/go-ini/ini" ) @@ -77,7 +77,7 @@ func (config *AercConfig) parseBinds(root string) error { return err } } - logging.Debugf("Parsing key bindings configuration from %s", filename) + log.Debugf("Parsing key bindings configuration from %s", filename) binds, err := ini.Load(filename) if err != nil { return err @@ -122,7 +122,7 @@ func (config *AercConfig) parseBinds(root string) error { } } - logging.Debugf("binds.conf: %#v", config.Bindings) + log.Debugf("binds.conf: %#v", config.Bindings) return nil } @@ -212,7 +212,7 @@ func (config *AercConfig) LoadBinds(binds *ini.File, baseName string, baseGroup } } if !valid { - logging.Warnf("binds.conf: unexistent account: %s", acctName) + log.Warnf("binds.conf: unexistent account: %s", acctName) continue } contextualBind.ContextType = BIND_CONTEXT_ACCOUNT diff --git a/config/compose.go b/config/compose.go index f9c1ba90..cf9c9b58 100644 --- a/config/compose.go +++ b/config/compose.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - "git.sr.ht/~rjarry/aerc/logging" + "git.sr.ht/~rjarry/aerc/log" "github.com/go-ini/ini" ) @@ -55,6 +55,6 @@ func (config *AercConfig) parseCompose(file *ini.File) error { } end: - logging.Debugf("aerc.conf: [compose] %#v", config.Compose) + log.Debugf("aerc.conf: [compose] %#v", config.Compose) return nil } diff --git a/config/filters.go b/config/filters.go index ffa203f9..2b5a0c84 100644 --- a/config/filters.go +++ b/config/filters.go @@ -4,7 +4,7 @@ import ( "regexp" "strings" - "git.sr.ht/~rjarry/aerc/logging" + "git.sr.ht/~rjarry/aerc/log" "github.com/go-ini/ini" ) @@ -62,6 +62,6 @@ func (config *AercConfig) parseFilters(file *ini.File) error { } end: - logging.Debugf("aerc.conf: [filters] %#v", config.Filters) + log.Debugf("aerc.conf: [filters] %#v", config.Filters) return nil } diff --git a/config/general.go b/config/general.go index 2a462a3e..8ca22471 100644 --- a/config/general.go +++ b/config/general.go @@ -4,25 +4,25 @@ import ( "fmt" "os" - "git.sr.ht/~rjarry/aerc/logging" + "git.sr.ht/~rjarry/aerc/log" "github.com/go-ini/ini" "github.com/mattn/go-isatty" "github.com/mitchellh/go-homedir" ) type GeneralConfig struct { - DefaultSavePath string `ini:"default-save-path"` - PgpProvider string `ini:"pgp-provider"` - UnsafeAccountsConf bool `ini:"unsafe-accounts-conf"` - LogFile string `ini:"log-file"` - LogLevel logging.LogLevel `ini:"-"` + DefaultSavePath string `ini:"default-save-path"` + PgpProvider string `ini:"pgp-provider"` + UnsafeAccountsConf bool `ini:"unsafe-accounts-conf"` + LogFile string `ini:"log-file"` + LogLevel log.LogLevel `ini:"-"` } func defaultGeneralConfig() GeneralConfig { return GeneralConfig{ PgpProvider: "internal", UnsafeAccountsConf: false, - LogLevel: logging.INFO, + LogLevel: log.INFO, } } @@ -39,7 +39,7 @@ func (config *AercConfig) parseGeneral(file *ini.File) error { } level, err = gen.GetKey("log-level") if err == nil { - l, err := logging.ParseLevel(level.String()) + l, err := log.ParseLevel(level.String()) if err != nil { return err } @@ -52,7 +52,7 @@ end: if !isatty.IsTerminal(os.Stdout.Fd()) { logFile = os.Stdout // redirected to file, force DEBUG level - config.General.LogLevel = logging.DEBUG + config.General.LogLevel = log.DEBUG } else if config.General.LogFile != "" { path, err := homedir.Expand(config.General.LogFile) if err != nil { @@ -64,8 +64,8 @@ end: return fmt.Errorf("log-file: %w", err) } } - logging.Init(logFile, config.General.LogLevel) - logging.Debugf("aerc.conf: [general] %#v", config.General) + log.Init(logFile, config.General.LogLevel) + log.Debugf("aerc.conf: [general] %#v", config.General) return nil } diff --git a/config/openers.go b/config/openers.go index d41c5455..c62ec974 100644 --- a/config/openers.go +++ b/config/openers.go @@ -3,7 +3,7 @@ package config import ( "strings" - "git.sr.ht/~rjarry/aerc/logging" + "git.sr.ht/~rjarry/aerc/log" "github.com/go-ini/ini" "github.com/google/shlex" ) @@ -24,6 +24,6 @@ func (config *AercConfig) parseOpeners(file *ini.File) error { } out: - logging.Debugf("aerc.conf: [openers] %#v", config.Openers) + log.Debugf("aerc.conf: [openers] %#v", config.Openers) return nil } diff --git a/config/statusline.go b/config/statusline.go index a289c84d..1e7d723e 100644 --- a/config/statusline.go +++ b/config/statusline.go @@ -1,7 +1,7 @@ package config import ( - "git.sr.ht/~rjarry/aerc/logging" + "git.sr.ht/~rjarry/aerc/log" "github.com/go-ini/ini" ) @@ -28,6 +28,6 @@ func (config *AercConfig) parseStatusline(file *ini.File) error { return err } out: - logging.Debugf("aerc.conf: [statusline] %#v", config.Statusline) + log.Debugf("aerc.conf: [statusline] %#v", config.Statusline) return nil } diff --git a/config/templates.go b/config/templates.go index 2f581e44..32d838fc 100644 --- a/config/templates.go +++ b/config/templates.go @@ -5,7 +5,7 @@ import ( "strings" "git.sr.ht/~rjarry/aerc/lib/templates" - "git.sr.ht/~rjarry/aerc/logging" + "git.sr.ht/~rjarry/aerc/log" "github.com/go-ini/ini" ) @@ -56,7 +56,7 @@ func (config *AercConfig) parseTemplates(file *ini.File) error { return err } - logging.Debugf("aerc.conf: [templates] %#v", config.Templates) + log.Debugf("aerc.conf: [templates] %#v", config.Templates) return nil } diff --git a/config/triggers.go b/config/triggers.go index af400501..2a357bc0 100644 --- a/config/triggers.go +++ b/config/triggers.go @@ -8,7 +8,7 @@ import ( "github.com/google/shlex" "git.sr.ht/~rjarry/aerc/lib/format" - "git.sr.ht/~rjarry/aerc/logging" + "git.sr.ht/~rjarry/aerc/log" "git.sr.ht/~rjarry/aerc/models" ) @@ -26,7 +26,7 @@ func (config *AercConfig) parseTriggers(file *ini.File) error { return err } out: - logging.Debugf("aerc.conf: [triggers] %#v", config.Triggers) + log.Debugf("aerc.conf: [triggers] %#v", config.Triggers) return nil } @@ -74,6 +74,6 @@ func (trig *TriggersConfig) ExecNewEmail(account *AccountConfig, return fmt.Sprintf(formatstr, args...), nil }) if err != nil { - logging.Errorf("failed to run new-email trigger: %v", err) + log.Errorf("failed to run new-email trigger: %v", err) } } diff --git a/config/ui.go b/config/ui.go index 16a296df..9af47085 100644 --- a/config/ui.go +++ b/config/ui.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "git.sr.ht/~rjarry/aerc/logging" + "git.sr.ht/~rjarry/aerc/log" "github.com/gdamore/tcell/v2" "github.com/go-ini/ini" "github.com/imdario/mergo" @@ -211,7 +211,7 @@ func (config *AercConfig) parseUi(file *ini.File) error { } } - logging.Debugf("aerc.conf: [ui] %#v", config.Ui) + log.Debugf("aerc.conf: [ui] %#v", config.Ui) return nil } @@ -294,7 +294,7 @@ func (config *AercConfig) mergeContextualUi(baseUi UIConfig, err := mergo.Merge(&baseUi, contextualUi.UiConfig, mergo.WithOverride) if err != nil { - logging.Warnf("merge ui failed: %v", err) + log.Warnf("merge ui failed: %v", err) } if contextualUi.UiConfig.StyleSetName != "" { baseUi.style = contextualUi.UiConfig.style diff --git a/config/viewer.go b/config/viewer.go index fe93f389..c00e62f4 100644 --- a/config/viewer.go +++ b/config/viewer.go @@ -3,7 +3,7 @@ package config import ( "strings" - "git.sr.ht/~rjarry/aerc/logging" + "git.sr.ht/~rjarry/aerc/log" "github.com/go-ini/ini" ) @@ -49,6 +49,6 @@ func (config *AercConfig) parseViewer(file *ini.File) error { } } out: - logging.Debugf("aerc.conf: [viewer] %#v", config.Viewer) + log.Debugf("aerc.conf: [viewer] %#v", config.Viewer) return nil } |