go/mailpit
1
0
Fork 0
mirror of https://github.com/axllent/mailpit.git synced 2025-08-13 20:04:49 +02:00
Code Issues Releases Activity

Chore: Standardize error logging & formatting

Browse Source
This commit is contained in:
Ralph Slooten
2024-01-01 15:25:38 +13:00
parent 4568b95bd6
commit 83e291208a
7 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/ingest.go
View File

@@ -112,8 +112,7 @@ The --recent flag will only consider files with a modification date within the l
err = smtp.SendMail(sendmail.SMTPAddr, nil, returnPath, recipients, body) err = smtp.SendMail(sendmail.SMTPAddr, nil, returnPath, recipients, body)
if err != nil { if err != nil {
logger.Log().Errorf("error sending mail: %s", err.Error()) logger.Log().Errorf("error sending mail: %s (%s)", err.Error(), path)
logger.Log().Errorf(path)
return nil return nil
} }

4
internal/storage/utils.go
View File

@@ -142,9 +142,9 @@ func dbCron() {
err = tx.Commit() err = tx.Commit()
if err != nil { if err != nil {
logger.Log().Errorf(err.Error()) logger.Log().Errorf("[db] %s", err.Error())
if err := tx.Rollback(); err != nil { if err := tx.Rollback(); err != nil {
logger.Log().Errorf(err.Error()) logger.Log().Errorf("[db] %s", err.Error())
} }
} }

10
internal/updater/updater.go
View File

@@ -221,7 +221,7 @@ func downloadToFile(url, fileName string) error {
defer func() { defer func() {
if err := out.Close(); err != nil { if err := out.Close(); err != nil {
logger.Log().Errorf("Error closing file: %s\n", err) logger.Log().Errorf("error closing file: %s", err.Error())
} }
}() }()
@@ -305,11 +305,7 @@ func replaceFile(dst, src string) error {
} }
// remove the src file // remove the src file
if err := os.Remove(src); err != nil { return os.Remove(src)
return err
}
return nil
} }
// GetTempDir will create & return a temporary directory if one has not been specified // GetTempDir will create & return a temporary directory if one has not been specified
@@ -323,7 +319,7 @@ func getTempDir() string {
} }
if err := mkDirIfNotExists(tempDir); err != nil { if err := mkDirIfNotExists(tempDir); err != nil {
// need a better way to exit // need a better way to exit
logger.Log().Errorf("Error: %v", err) logger.Log().Errorf("error: %s", err.Error())
os.Exit(2) os.Exit(2)
} }

2
server/server.go
View File

@@ -37,7 +37,7 @@ func Listen() {
serverRoot, err := fs.Sub(embeddedFS, "ui") serverRoot, err := fs.Sub(embeddedFS, "ui")
if err != nil { if err != nil {
logger.Log().Errorf("[http] %s", err) logger.Log().Errorf("[http] %s", err.Error())
os.Exit(1) os.Exit(1)
} }

8
server/webhook/webhook.go
View File

@@ -41,13 +41,13 @@ func Send(msg interface{}) {
rl.Do(func() { rl.Do(func() {
b, err := json.Marshal(msg) b, err := json.Marshal(msg)
if err != nil { if err != nil {
logger.Log().Errorf("[webhook] invalid data: %s", err) logger.Log().Errorf("[webhook] invalid data: %s", err.Error())
return return
} }
req, err := http.NewRequest("POST", config.WebhookURL, bytes.NewBuffer(b)) req, err := http.NewRequest("POST", config.WebhookURL, bytes.NewBuffer(b))
if err != nil { if err != nil {
logger.Log().Errorf("[webhook] error: %s", err) logger.Log().Errorf("[webhook] error: %s", err.Error())
return return
} }
@@ -57,12 +57,12 @@ func Send(msg interface{}) {
client := &http.Client{} client := &http.Client{}
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
logger.Log().Errorf("[webhook] error sending data: %s", err) logger.Log().Errorf("[webhook] error sending data: %s", err.Error())
return return
} }
if resp.StatusCode < 200 || resp.StatusCode > 299 { if resp.StatusCode < 200 || resp.StatusCode > 299 {
logger.Log().Warningf("[webhook] %s returned a %d status", config.WebhookURL, resp.StatusCode) logger.Log().Warnf("[webhook] %s returned a %d status", config.WebhookURL, resp.StatusCode)
return return
} }

2
server/websockets/client.go
View File

@@ -63,7 +63,7 @@ func (c *Client) readPump() {
_, _, err := c.conn.NextReader() _, _, err := c.conn.NextReader()
if err != nil { if err != nil {
if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) { if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
logger.Log().Errorf("[websocket] error: %v", err) logger.Log().Errorf("[websocket] error: %v", err.Error())
} }
break break
} }

2
server/websockets/hub.go
View File

@@ -79,7 +79,7 @@ func Broadcast(t string, msg interface{}) {
b, err := json.Marshal(w) b, err := json.Marshal(w)
if err != nil { if err != nil {
logger.Log().Errorf("[websocket] broadcast received invalid data: %s", err) logger.Log().Errorf("[websocket] broadcast received invalid data: %s", err.Error())
return return
} }