diff --git a/cmd/ingest.go b/cmd/ingest.go index 7c32f96..c575668 100644 --- a/cmd/ingest.go +++ b/cmd/ingest.go @@ -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) if err != nil { - logger.Log().Errorf("error sending mail: %s", err.Error()) - logger.Log().Errorf(path) + logger.Log().Errorf("error sending mail: %s (%s)", err.Error(), path) return nil } diff --git a/internal/storage/utils.go b/internal/storage/utils.go index f2ffd74..c25e7d6 100644 --- a/internal/storage/utils.go +++ b/internal/storage/utils.go @@ -142,9 +142,9 @@ func dbCron() { err = tx.Commit() if err != nil { - logger.Log().Errorf(err.Error()) + logger.Log().Errorf("[db] %s", err.Error()) if err := tx.Rollback(); err != nil { - logger.Log().Errorf(err.Error()) + logger.Log().Errorf("[db] %s", err.Error()) } } diff --git a/internal/updater/updater.go b/internal/updater/updater.go index f980550..6c5d2f5 100644 --- a/internal/updater/updater.go +++ b/internal/updater/updater.go @@ -221,7 +221,7 @@ func downloadToFile(url, fileName string) error { defer func() { 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 - if err := os.Remove(src); err != nil { - return err - } - - return nil + return os.Remove(src) } // 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 { // need a better way to exit - logger.Log().Errorf("Error: %v", err) + logger.Log().Errorf("error: %s", err.Error()) os.Exit(2) } diff --git a/server/server.go b/server/server.go index 46d9085..d695c58 100644 --- a/server/server.go +++ b/server/server.go @@ -37,7 +37,7 @@ func Listen() { serverRoot, err := fs.Sub(embeddedFS, "ui") if err != nil { - logger.Log().Errorf("[http] %s", err) + logger.Log().Errorf("[http] %s", err.Error()) os.Exit(1) } diff --git a/server/webhook/webhook.go b/server/webhook/webhook.go index b0ad4fa..bbb4abf 100644 --- a/server/webhook/webhook.go +++ b/server/webhook/webhook.go @@ -41,13 +41,13 @@ func Send(msg interface{}) { rl.Do(func() { b, err := json.Marshal(msg) if err != nil { - logger.Log().Errorf("[webhook] invalid data: %s", err) + logger.Log().Errorf("[webhook] invalid data: %s", err.Error()) return } req, err := http.NewRequest("POST", config.WebhookURL, bytes.NewBuffer(b)) if err != nil { - logger.Log().Errorf("[webhook] error: %s", err) + logger.Log().Errorf("[webhook] error: %s", err.Error()) return } @@ -57,12 +57,12 @@ func Send(msg interface{}) { client := &http.Client{} resp, err := client.Do(req) if err != nil { - logger.Log().Errorf("[webhook] error sending data: %s", err) + logger.Log().Errorf("[webhook] error sending data: %s", err.Error()) return } 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 } diff --git a/server/websockets/client.go b/server/websockets/client.go index ddefa1f..547ea0e 100644 --- a/server/websockets/client.go +++ b/server/websockets/client.go @@ -63,7 +63,7 @@ func (c *Client) readPump() { _, _, err := c.conn.NextReader() if err != nil { if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) { - logger.Log().Errorf("[websocket] error: %v", err) + logger.Log().Errorf("[websocket] error: %v", err.Error()) } break } diff --git a/server/websockets/hub.go b/server/websockets/hub.go index cbaae88..dc5c7e4 100644 --- a/server/websockets/hub.go +++ b/server/websockets/hub.go @@ -79,7 +79,7 @@ func Broadcast(t string, msg interface{}) { b, err := json.Marshal(w) 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 }