fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Fix generated JSON in case of error

Browse source
This commit is contained in:
nemunaire 2017-10-26 14:14:54 +02:00 • committed by Pierre-Olivier Mercier
parent ce46313dd1
commit d03350f6b3
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/api/handlers.go
View file

@ -67,7 +67,7 @@ func apiHandler(f DispatchFunction) func(http.ResponseWriter, *http.Request, htt
w.WriteHeader(resStatus) w.WriteHeader(resStatus)
w.Write(bts) w.Write(bts)
} else if j, err := json.Marshal(ret); err != nil { } else if j, err := json.Marshal(ret); err != nil {
http.Error(w, fmt.Sprintf("{\"errmsg\":\"%q\"}", err), http.StatusInternalServerError) http.Error(w, fmt.Sprintf("{\"errmsg\":%q}", err), http.StatusInternalServerError)
} else { } else {
w.WriteHeader(resStatus) w.WriteHeader(resStatus)
w.Write(j) w.Write(j)

2
admin/time.go
View file

@ -15,7 +15,7 @@ import (
func init() { func init() {
api.Router().GET("/time.json", func(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { api.Router().GET("/time.json", func(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
if config, err := settings.ReadSettings(path.Join(api.TeamsDir, settings.SettingsFile)); err != nil { if config, err := settings.ReadSettings(path.Join(api.TeamsDir, settings.SettingsFile)); err != nil {
http.Error(w, fmt.Sprintf("{\"errmsg\":\"%q\"}", err), http.StatusInternalServerError) http.Error(w, fmt.Sprintf("{\"errmsg\":%q}", err), http.StatusInternalServerError)
} else { } else {
time.ChallengeStart = config.Start time.ChallengeStart = config.Start
time.ChallengeEnd = config.End time.ChallengeEnd = config.End

2
frontend/time/time.go
View file

@ -25,7 +25,7 @@ func (t TimeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
if j, err := json.Marshal(timeObject{ChallengeStart.Unix(), time.Now().Unix(), int(ChallengeEnd.Sub(ChallengeStart).Seconds())}); err != nil { if j, err := json.Marshal(timeObject{ChallengeStart.Unix(), time.Now().Unix(), int(ChallengeEnd.Sub(ChallengeStart).Seconds())}); err != nil {
http.Error(w, fmt.Sprintf("{\"errmsg\":\"%q\"}", err), http.StatusInternalServerError) http.Error(w, fmt.Sprintf("{\"errmsg\":%q}", err), http.StatusInternalServerError)
} else { } else {
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
w.Write(j) w.Write(j)