Skip to content

Commit

Permalink
add rough error logging for read/write errors
Browse files Browse the repository at this point in the history
  • Loading branch information
hrfee committed Nov 2, 2020
1 parent c84ea17 commit d4a92ad
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
5 changes: 4 additions & 1 deletion api.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,10 @@ func (app *appContext) getOmbiUser(jfID string) (map[string]interface{}, int, er
return nil, code, err
}
username := jfUser["Name"].(string)
email := app.storage.emails[jfID].(string)
email := ""
if e, ok := app.storage.emails[jfID]; ok {
email := e.(string)
}
for _, ombiUser := range ombiUsers {
ombiAddr := ""
if a, ok := ombiUser["emailAddress"]; ok && a != nil {
Expand Down
12 changes: 7 additions & 5 deletions common/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ type TimeoutHandler func()
// NewTimeoutHandler returns a new Timeout handler.
func NewTimeoutHandler(name, addr string, noFail bool) TimeoutHandler {
return func() {
out := fmt.Sprintf("Failed to authenticate with %s @ %s: Timed out", name, addr)
if noFail {
log.Print(out)
} else {
log.Fatalf(out)
if r := recover(); r != nil {
out := fmt.Sprintf("Failed to authenticate with %s @ %s: Timed out", name, addr)
if noFail {
log.Print(out)
} else {
log.Fatalf(out)
}
}
}
}
7 changes: 7 additions & 0 deletions storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package main
import (
"encoding/json"
"io/ioutil"
"log"
"strconv"
"time"
)
Expand Down Expand Up @@ -172,6 +173,9 @@ func loadJSON(path string, obj interface{}) error {
file = []byte("{}")
}
err = json.Unmarshal(file, &obj)
if err != nil {
log.Printf("ERROR: Failed to read \"%s\": %s", path, err)
}
return err
}

Expand All @@ -181,5 +185,8 @@ func storeJSON(path string, obj interface{}) error {
return err
}
err = ioutil.WriteFile(path, data, 0644)
if err != nil {
log.Printf("ERROR: Failed to write to \"%s\": %s", path, err)
}
return err
}

0 comments on commit d4a92ad

Please sign in to comment.