From 23a05d17ac1d23466ff73efa19576d43d06efe4b Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Sun, 27 Nov 2022 11:29:34 +0100 Subject: 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 Signed-off-by: Robin Jarry Tested-by: Bence Ferdinandy Acked-by: Tim Culverhouse --- lib/crypto/gpg/gpgbin/gpgbin.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/crypto/gpg') diff --git a/lib/crypto/gpg/gpgbin/gpgbin.go b/lib/crypto/gpg/gpgbin/gpgbin.go index d83c45fb..a83ebb37 100644 --- a/lib/crypto/gpg/gpgbin/gpgbin.go +++ b/lib/crypto/gpg/gpgbin/gpgbin.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "git.sr.ht/~rjarry/aerc/logging" + "git.sr.ht/~rjarry/aerc/log" "git.sr.ht/~rjarry/aerc/models" ) @@ -65,7 +65,7 @@ func getIdentity(key uint64) string { cmd.Stdout = &outbuf err := cmd.Run() if err != nil { - logging.Errorf("gpg: failed to get identity: %v", err) + log.Errorf("gpg: failed to get identity: %v", err) return "" } out := strings.Split(outbuf.String(), "\n") @@ -91,7 +91,7 @@ func getKeyId(s string, private bool) string { cmd.Stdout = &outbuf err := cmd.Run() if err != nil { - logging.Errorf("gpg: failed to get key ID: %v", err) + log.Errorf("gpg: failed to get key ID: %v", err) return "" } out := strings.Split(outbuf.String(), "\n") @@ -129,7 +129,7 @@ func parse(r io.Reader, md *models.MessageDetails) error { } if strings.HasPrefix(line, "[GNUPG:]") { msgCollecting = false - logging.Tracef(line) + log.Tracef(line) } if msgCollecting { msgContent = append(msgContent, scanner.Bytes()...) -- cgit