Improve logging

2 files changed, 26 insertions, 7 deletions

diff --git a/worker/imap/worker.go b/worker/imap/worker.go
index 6971f8c..d3ef715 100644
--- a/worker/imap/worker.go
+++ b/worker/imap/worker.go
@@ -2,13 +2,16 @@ package imap
 
 import (
 	"fmt"
+	"log"
 	"net/url"
 	"strings"
 
-	"git.sr.ht/~sircmpwn/aerc2/worker/types"
+	"github.com/davecgh/go-spew/spew"
 	"github.com/emersion/go-imap"
-	"github.com/emersion/go-imap/client"
 	"github.com/emersion/go-imap-idle"
+	"github.com/emersion/go-imap/client"
+
+	"git.sr.ht/~sircmpwn/aerc2/worker/types"
 )
 
 var errUnsupported = fmt.Errorf("unsupported command")
@@ -31,13 +34,15 @@ type IMAPWorker struct {
 
 	client  *imapClient
 	updates chan client.Update
+	logger  *log.Logger
 }
 
-func NewIMAPWorker() *IMAPWorker {
+func NewIMAPWorker(logger *log.Logger) *IMAPWorker {
 	return &IMAPWorker{
 		messages: make(chan types.WorkerMessage, 50),
 		actions:  make(chan types.WorkerMessage, 50),
 		updates:  make(chan client.Update, 50),
+		logger:   logger,
 	}
 }
 
@@ -126,11 +131,24 @@ func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error {
 	return nil
 }
 
+// Logs an action but censors passwords
+func (w *IMAPWorker) logAction(msg types.WorkerMessage) {
+	switch msg := msg.(type) {
+	case types.Configure:
+		src := msg.Config.Source
+		msg.Config.Source = "[obsfucated]"
+		w.logger.Printf("<= %s", spew.Sdump(msg))
+		msg.Config.Source = src
+	default:
+		w.logger.Printf("<= %s", spew.Sdump(msg))
+	}
+}
+
 func (w *IMAPWorker) Run() {
 	for {
 		select {
 		case msg := <-w.actions:
-			fmt.Printf("<= %T\n", msg)
+			w.logAction(msg)
 			if err := w.handleMessage(msg); err == errUnsupported {
 				w.messages <- types.Unsupported{
 					Message: types.RespondTo(msg),
@@ -146,7 +164,7 @@ func (w *IMAPWorker) Run() {
 				}
 			}
 		case update := <-w.updates:
-			fmt.Printf("<= %T\n", update)
+			w.logger.Printf("[= %s", spew.Sdump(update))
 		}
 	}
 }
diff --git a/worker/worker.go b/worker/worker.go
index c8ec622..b665884 100644
--- a/worker/worker.go
+++ b/worker/worker.go
@@ -5,6 +5,7 @@ import (
 	"git.sr.ht/~sircmpwn/aerc2/worker/types"
 
 	"fmt"
+	"log"
 	"net/url"
 )
 
@@ -15,7 +16,7 @@ type Worker interface {
 }
 
 // Guesses the appropriate worker type based on the given source string
-func NewWorker(source string) (Worker, error) {
+func NewWorker(source string, logger *log.Logger) (Worker, error) {
 	u, err := url.Parse(source)
 	if err != nil {
 		return nil, err
@@ -23,7 +24,7 @@ func NewWorker(source string) (Worker, error) {
 	switch u.Scheme {
 	case "imap":
 	case "imaps":
-		return imap.NewIMAPWorker(), nil
+		return imap.NewIMAPWorker(logger), nil
 	}
 	return nil, fmt.Errorf("Unknown backend %s", u.Scheme)
 }