wolvie/short
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved error logging

Browse Source
This commit is contained in:
Tom Andrade 2019-05-01 01:02:27 +02:00
parent fcce320c39
commit bcb1c5a641
Signed by: wolvie
GPG Key ID: 31AAB07872E82669
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.go
View File

@ -135,7 +135,9 @@ func itemsDump(w http.ResponseWriter, r *http.Request) {
pool.Items(), pool.Items(),
) )
if err != nil { if err != nil {
log.Fatal("BOOM") log.Println(err)
w.WriteHeader(http.StatusInternalServerError)
internalErrorTmpl.Execute(w, err.Error())
} }
w.Write( w.Write(
[]byte(dumpObj), []byte(dumpObj),
@ -149,7 +151,7 @@ func itemsFromFile(w http.ResponseWriter, r *http.Request, dumpFile string) {
if err != nil { if err != nil {
log.Println(err) log.Println(err)
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
internalErrorTmpl.Execute(w, "Cannot open file "+dumpFile) internalErrorTmpl.Execute(w, "Cannot open file "+dumpFile+"\n"+err.Error())
} else { } else {
pool = cache.NewFrom(240*time.Hour, 1*time.Hour, dumpObj) pool = cache.NewFrom(240*time.Hour, 1*time.Hour, dumpObj)
okTmpl.Execute(w, "Imported "+strconv.Itoa(len(dumpObj))+" items to the DB") okTmpl.Execute(w, "Imported "+strconv.Itoa(len(dumpObj))+" items to the DB")
@ -163,7 +165,7 @@ func itemsFromPost(w http.ResponseWriter, r *http.Request) {
if err != nil { if err != nil {
log.Println(err) log.Println(err)
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
internalErrorTmpl.Execute(w, "Cannot parse JSON") internalErrorTmpl.Execute(w, "Cannot parse JSON: "+err.Error())
} else { } else {
pool = cache.NewFrom(240*time.Hour, 1*time.Hour, dumpObj) pool = cache.NewFrom(240*time.Hour, 1*time.Hour, dumpObj)
okTmpl.Execute(w, "Imported "+strconv.Itoa(len(dumpObj))+" items to the DB") okTmpl.Execute(w, "Imported "+strconv.Itoa(len(dumpObj))+" items to the DB")
@ -177,7 +179,7 @@ func itemsDumpToFile(w http.ResponseWriter, r *http.Request, dumpFile string) {
err := ioutil.WriteFile(dumpFile, dumpObj, 0644) err := ioutil.WriteFile(dumpFile, dumpObj, 0644)
if err != nil { if err != nil {
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
internalErrorTmpl.Execute(w, "Failed to open json file") internalErrorTmpl.Execute(w, "Failed to open json file: "+err.Error())
} else { } else {
okTmpl.Execute(w, "Dump writen to: "+dumpFile) okTmpl.Execute(w, "Dump writen to: "+dumpFile)
} }