From 4368541a96a9b1114e2ffcff026a08b3d72c11eb Mon Sep 17 00:00:00 2001
From: Ralph Slooten <axllent@gmail.com>
Date: Thu, 13 Oct 2022 02:53:53 +1300
Subject: [PATCH] Update logging format

---
 sendmail/cmd/cmd.go         | 4 ++--
 server/server.go            | 5 ++---
 server/websockets/client.go | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/sendmail/cmd/cmd.go b/sendmail/cmd/cmd.go
index 21969e1..6bf2ef7 100644
--- a/sendmail/cmd/cmd.go
+++ b/sendmail/cmd/cmd.go
@@ -8,12 +8,12 @@ import (
 	"bytes"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"net/mail"
 	"net/smtp"
 	"os"
 	"os/user"
 
+	"github.com/axllent/mailpit/logger"
 	flag "github.com/spf13/pflag"
 )
 
@@ -80,6 +80,6 @@ func Run() {
 	err = smtp.SendMail(smtpAddr, nil, fromAddr, recip, body)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "error sending mail")
-		log.Fatal(err)
+		logger.Log().Fatal(err)
 	}
 }
diff --git a/server/server.go b/server/server.go
index 1f997cd..f5ddb55 100644
--- a/server/server.go
+++ b/server/server.go
@@ -5,7 +5,6 @@ import (
 	"embed"
 	"io"
 	"io/fs"
-	"log"
 	"net/http"
 	"os"
 	"strings"
@@ -47,10 +46,10 @@ func Listen() {
 
 	if config.UISSLCert != "" && config.UISSLKey != "" {
 		logger.Log().Infof("[http] starting secure server on https://%s", config.HTTPListen)
-		log.Fatal(http.ListenAndServeTLS(config.HTTPListen, config.UISSLCert, config.UISSLKey, nil))
+		logger.Log().Fatal(http.ListenAndServeTLS(config.HTTPListen, config.UISSLCert, config.UISSLKey, nil))
 	} else {
 		logger.Log().Infof("[http] starting server on http://%s", config.HTTPListen)
-		log.Fatal(http.ListenAndServe(config.HTTPListen, nil))
+		logger.Log().Fatal(http.ListenAndServe(config.HTTPListen, nil))
 	}
 }
 
diff --git a/server/websockets/client.go b/server/websockets/client.go
index 8499dce..d857d93 100644
--- a/server/websockets/client.go
+++ b/server/websockets/client.go
@@ -5,11 +5,11 @@
 package websockets
 
 import (
-	"log"
 	"net/http"
 	"time"
 
 	"github.com/axllent/mailpit/config"
+	"github.com/axllent/mailpit/logger"
 	"github.com/gorilla/websocket"
 )
 
@@ -117,7 +117,7 @@ func ServeWs(hub *Hub, w http.ResponseWriter, r *http.Request) {
 
 	conn, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
-		log.Println(err)
+		logger.Log().Error(err)
 		return
 	}