logging: use level-based logger functions

Do not pass logger objects around anymore. Shuffle some messages to make
them consistent with the new logging API. Avoid using %v when a more
specific verb exists for the argument types.

The loggers are completely disabled (i.e. Sprintf is not even called)
by default. They are only enabled when redirecting stdout to a file.

Signed-off-by: Robin Jarry <robin@jarry.cc>
Acked-by: Moritz Poldrack <moritz@poldrack.dev>

4 files changed, 9 insertions, 46 deletions

diff --git a/lib/crypto/crypto.go b/lib/crypto/crypto.go
index 3c961ad4..8f895b42 100644
--- a/lib/crypto/crypto.go
+++ b/lib/crypto/crypto.go
@@ -3,7 +3,6 @@ package crypto
 import (
 	"bytes"
 	"io"
-	"log"
 
 	"git.sr.ht/~rjarry/aerc/lib/crypto/gpg"
 	"git.sr.ht/~rjarry/aerc/lib/crypto/pgp"
@@ -17,7 +16,7 @@ type Provider interface {
 	Encrypt(*bytes.Buffer, []string, string, openpgp.PromptFunction, *mail.Header) (io.WriteCloser, error)
 	Sign(*bytes.Buffer, string, openpgp.PromptFunction, *mail.Header) (io.WriteCloser, error)
 	ImportKeys(io.Reader) error
-	Init(*log.Logger) error
+	Init() error
 	Close()
 	GetSignerKeyId(string) (string, error)
 	GetKeyId(string) (string, error)
diff --git a/lib/crypto/gpg/gpg.go b/lib/crypto/gpg/gpg.go
index 00125ba6..e545e1c9 100644
--- a/lib/crypto/gpg/gpg.go
+++ b/lib/crypto/gpg/gpg.go
@@ -3,7 +3,6 @@ package gpg
 import (
 	"bytes"
 	"io"
-	"log"
 	"os/exec"
 
 	"git.sr.ht/~rjarry/aerc/lib/crypto/gpg/gpgbin"
@@ -13,12 +12,9 @@ import (
 )
 
 // Mail satisfies the PGPProvider interface in aerc
-type Mail struct {
-	logger *log.Logger
-}
+type Mail struct{}
 
-func (m *Mail) Init(l *log.Logger) error {
-	m.logger = l
+func (m *Mail) Init() error {
 	_, err := exec.LookPath("gpg")
 	return err
 }
diff --git a/lib/crypto/gpg/gpgbin/gpgbin.go b/lib/crypto/gpg/gpgbin/gpgbin.go
index 9f79e972..2eb83dc9 100644
--- a/lib/crypto/gpg/gpgbin/gpgbin.go
+++ b/lib/crypto/gpg/gpgbin/gpgbin.go
@@ -6,15 +6,12 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
-	"log"
-	"os"
 	"os/exec"
 	"strconv"
 	"strings"
 
+	"git.sr.ht/~rjarry/aerc/logging"
 	"git.sr.ht/~rjarry/aerc/models"
-	"github.com/mattn/go-isatty"
 )
 
 // gpg represents a gpg command with buffers attached to stdout and stderr
@@ -112,17 +109,6 @@ func longKeyToUint64(key string) (uint64, error) {
 
 // parse parses the output of gpg --status-fd
 func parse(r io.Reader, md *models.MessageDetails) error {
-	var (
-		logOut io.Writer
-		logger *log.Logger
-	)
-	if !isatty.IsTerminal(os.Stdout.Fd()) {
-		logOut = os.Stdout
-	} else {
-		logOut = ioutil.Discard
-		os.Stdout, _ = os.Open(os.DevNull)
-	}
-	logger = log.New(logOut, "", log.LstdFlags)
 	var err error
 	var msgContent []byte
 	var msgCollecting bool
@@ -135,7 +121,7 @@ func parse(r io.Reader, md *models.MessageDetails) error {
 		}
 		if strings.HasPrefix(line, "[GNUPG:]") {
 			msgCollecting = false
-			logger.Println(line)
+			logging.Debugf(line)
 		}
 		if msgCollecting {
 			msgContent = append(msgContent, scanner.Bytes()...)
@@ -270,18 +256,3 @@ var micalgs = map[int]string{
 	10: "pgp-sha512",
 	11: "pgp-sha224",
 }
-
-func logger(s string) {
-	var (
-		logOut io.Writer
-		logger *log.Logger
-	)
-	if !isatty.IsTerminal(os.Stdout.Fd()) {
-		logOut = os.Stdout
-	} else {
-		logOut = ioutil.Discard
-		os.Stdout, _ = os.Open(os.DevNull)
-	}
-	logger = log.New(logOut, "", log.LstdFlags)
-	logger.Println(s)
-}
diff --git a/lib/crypto/pgp/pgp.go b/lib/crypto/pgp/pgp.go
index 4dbe37c7..647b091b 100644
--- a/lib/crypto/pgp/pgp.go
+++ b/lib/crypto/pgp/pgp.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"log"
 	"os"
 	"path"
 	"strings"
 	"time"
 
+	"git.sr.ht/~rjarry/aerc/logging"
 	"git.sr.ht/~rjarry/aerc/models"
 	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/ProtonMail/go-crypto/openpgp/armor"
@@ -21,9 +21,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-type Mail struct {
-	logger *log.Logger
-}
+type Mail struct{}
 
 var (
 	Keyring openpgp.EntityList
@@ -31,9 +29,8 @@ var (
 	locked bool
 )
 
-func (m *Mail) Init(l *log.Logger) error {
-	m.logger = l
-	m.logger.Println("Initializing PGP keyring")
+func (m *Mail) Init() error {
+	logging.Infof("Initializing PGP keyring")
 	os.MkdirAll(path.Join(xdg.DataHome(), "aerc"), 0700)
 
 	lockpath := path.Join(xdg.DataHome(), "aerc", "keyring.lock")