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 /commands/account/import-mbox.go | |
| 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 'commands/account/import-mbox.go')
| -rw-r--r-- | commands/account/import-mbox.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/commands/account/import-mbox.go b/commands/account/import-mbox.go index 93408aca..7dab1958 100644 --- a/commands/account/import-mbox.go +++ b/commands/account/import-mbox.go @@ -11,7 +11,7 @@ import ( "time" "git.sr.ht/~rjarry/aerc/commands" - "git.sr.ht/~rjarry/aerc/logging" + "git.sr.ht/~rjarry/aerc/log" "git.sr.ht/~rjarry/aerc/models" "git.sr.ht/~rjarry/aerc/widgets" mboxer "git.sr.ht/~rjarry/aerc/worker/mbox" @@ -55,7 +55,7 @@ func (ImportMbox) Execute(aerc *widgets.Aerc, args []string) error { importFolder := func() { statusInfo := fmt.Sprintln("Importing", filename, "to folder", folder) aerc.PushStatus(statusInfo, 10*time.Second) - logging.Debugf(statusInfo) + log.Debugf(statusInfo) f, err := os.Open(filename) if err != nil { aerc.PushError(err.Error()) @@ -78,7 +78,7 @@ func (ImportMbox) Execute(aerc *widgets.Aerc, args []string) error { var buf bytes.Buffer r, err := m.NewReader() if err != nil { - logging.Errorf("could not get reader for uid %d", m.UID()) + log.Errorf("could not get reader for uid %d", m.UID()) break } nbytes, _ := io.Copy(&buf, r) @@ -92,11 +92,11 @@ func (ImportMbox) Execute(aerc *widgets.Aerc, args []string) error { switch msg := msg.(type) { case *types.Unsupported: errMsg := fmt.Sprintf("%s: AppendMessage is unsupported", args[0]) - logging.Errorf(errMsg) + log.Errorf(errMsg) aerc.PushError(errMsg) return case *types.Error: - logging.Errorf("AppendMessage failed: %v", msg.Error) + log.Errorf("AppendMessage failed: %v", msg.Error) done <- false case *types.Done: atomic.AddUint32(&appended, 1) @@ -113,17 +113,17 @@ func (ImportMbox) Execute(aerc *widgets.Aerc, args []string) error { retries -= 1 sleeping := time.Duration((5 - retries) * 1e9) - logging.Debugf("sleeping for %s before append message %d again", sleeping, i) + log.Debugf("sleeping for %s before append message %d again", sleeping, i) time.Sleep(sleeping) } case <-time.After(30 * time.Second): - logging.Warnf("timed-out; appended %d of %d", appended, len(messages)) + log.Warnf("timed-out; appended %d of %d", appended, len(messages)) return } } } infoStr := fmt.Sprintf("%s: imported %d of %d sucessfully.", args[0], appended, len(messages)) - logging.Debugf(infoStr) + log.Debugf(infoStr) aerc.SetStatus(infoStr) } |