fic/server
2
0
Fork 0
Code Issues Pull Requests 2 Releases Wiki Activity

frontend: move time in a separate package to be used elsewhere

Browse Source
This commit is contained in:
nemunaire 2017-01-19 13:08:38 +01:00 committed by nemunaire
parent 5c45bb5127
commit 6ee9b342f1
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/main.go
View File

@ -9,6 +9,7 @@ import (
"path" "path"
"time" "time"
fronttime "srs.epita.fr/fic-server/frontend/time"
"srs.epita.fr/fic-server/settings" "srs.epita.fr/fic-server/settings"
) )
@ -29,7 +30,7 @@ func touchStartedFile() {
} }
func reloadSettings(config settings.FICSettings) { func reloadSettings(config settings.FICSettings) {
if challengeStart != config.Start || challengeEnd != config.End { if fronttime.ChallengeStart != config.Start || fronttime.ChallengeEnd != config.End {
if touchTimer != nil { if touchTimer != nil {
touchTimer.Stop() touchTimer.Stop()
} }
@ -48,8 +49,8 @@ func reloadSettings(config settings.FICSettings) {
} }
log.Println("Challenge ends on", config.End) log.Println("Challenge ends on", config.End)
challengeStart = config.Start fronttime.ChallengeStart = config.Start
challengeEnd = config.End fronttime.ChallengeEnd = config.End
} else { } else {
log.Println("Configuration reloaded, but start/end times doesn't change.") log.Println("Configuration reloaded, but start/end times doesn't change.")
} }
@ -86,7 +87,7 @@ func main() {
http.Handle(fmt.Sprintf("%s/registration", *prefix), http.StripPrefix(fmt.Sprintf("%s/registration", *prefix), RegistrationHandler{})) http.Handle(fmt.Sprintf("%s/registration", *prefix), http.StripPrefix(fmt.Sprintf("%s/registration", *prefix), RegistrationHandler{}))
http.Handle(fmt.Sprintf("%s/resolution/", *prefix), http.StripPrefix(fmt.Sprintf("%s/resolution/", *prefix), ResolutionHandler{})) http.Handle(fmt.Sprintf("%s/resolution/", *prefix), http.StripPrefix(fmt.Sprintf("%s/resolution/", *prefix), ResolutionHandler{}))
http.Handle(fmt.Sprintf("%s/submission/", *prefix), http.StripPrefix(fmt.Sprintf("%s/submission/", *prefix), SubmissionHandler{})) http.Handle(fmt.Sprintf("%s/submission/", *prefix), http.StripPrefix(fmt.Sprintf("%s/submission/", *prefix), SubmissionHandler{}))
http.Handle(fmt.Sprintf("%s/time.json", *prefix), http.StripPrefix(*prefix, TimeHandler{})) http.Handle(fmt.Sprintf("%s/time.json", *prefix), http.StripPrefix(*prefix, fronttime.TimeHandler{}))
// Serve pages // Serve pages
log.Println(fmt.Sprintf("Ready, listening on %s", *bind)) log.Println(fmt.Sprintf("Ready, listening on %s", *bind))

6
frontend/submit.go
View File

@ -7,9 +7,9 @@ import (
"strconv" "strconv"
"strings" "strings"
"time" "time"
)
var challengeEnd time.Time = time.Unix(0, 0) fronttime "srs.epita.fr/fic-server/frontend/time"
)
type SubmissionHandler struct {} type SubmissionHandler struct {}
@ -36,7 +36,7 @@ func (s SubmissionHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
team := sURL[0] team := sURL[0]
if time.Now().Sub(challengeEnd) > 0 { if time.Now().Sub(fronttime.ChallengeEnd) > 0 {
http.Error(w, "{\"errmsg\":\"Vous ne pouvez plus soumettre, le challenge est terminé.\"}", http.StatusForbidden) http.Error(w, "{\"errmsg\":\"Vous ne pouvez plus soumettre, le challenge est terminé.\"}", http.StatusForbidden)
return return
} }

7
frontend/time.go → frontend/time/time.go
View File

@ -1,4 +1,4 @@
package main package time
import ( import (
"encoding/json" "encoding/json"
@ -8,7 +8,8 @@ import (
"time" "time"
) )
var challengeStart time.Time var ChallengeStart time.Time
var ChallengeEnd time.Time = time.Unix(0, 0)
type TimeHandler struct {} type TimeHandler struct {}
@ -23,7 +24,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)