-
+
diff --git a/admin/sync/full.go b/admin/sync/full.go
index 7388b077..f8cf5fe5 100644
--- a/admin/sync/full.go
+++ b/admin/sync/full.go
@@ -2,13 +2,14 @@ package sync
import (
"encoding/json"
+ "io"
"log"
"os"
"sync"
"time"
+ "srs.epita.fr/fic-server/admin/generation"
"srs.epita.fr/fic-server/libfic"
- "srs.epita.fr/fic-server/settings"
)
// DeepReportPath stores the path to the report generated during full recursive import.
@@ -132,8 +133,14 @@ func SyncDeep(i Importer) (errs SyncReport) {
EditDeepReport(&errs, true)
- if err := settings.ForceRegeneration(); err != nil {
+ resp, err := generation.FullGeneration()
+ if err != nil {
errs.Regeneration = append(errs.Regeneration, err.Error())
+ } else {
+ defer resp.Body.Close()
+
+ v, _ := io.ReadAll(resp.Body)
+ errs.Regeneration = append(errs.Regeneration, string(v))
}
DeepSyncProgress = 255
diff --git a/generator/generation.go b/generator/generation.go
index 2a08afd0..dfbfa4f3 100644
--- a/generator/generation.go
+++ b/generator/generation.go
@@ -10,17 +10,18 @@ import (
"path"
"runtime"
"sync"
+ "time"
"srs.epita.fr/fic-server/libfic"
)
var parallelJobs = runtime.NumCPU()
-var genQueue chan fic.GenStruct
+var genQueue chan *fic.GenStruct
var inQueueMutex sync.RWMutex
var inGenQueue map[fic.GenerateType]bool
func init() {
- genQueue = make(chan fic.GenStruct)
+ genQueue = make(chan *fic.GenStruct)
inGenQueue = map[fic.GenerateType]bool{}
}
@@ -47,12 +48,54 @@ func enqueueHandler(w http.ResponseWriter, r *http.Request) {
http.Error(w, "OK", http.StatusOK)
}
-func appendGenQueue(gs fic.GenStruct) {
- if gs.Type == fic.GenTeam || gs.Type == fic.GenTeamIssues {
- genQueue <- gs
+func performHandler(w http.ResponseWriter, r *http.Request) {
+ var gs fic.GenStruct
+
+ dec := json.NewDecoder(r.Body)
+ err := dec.Decode(&gs)
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusBadRequest)
return
}
+ log.Printf("POST /perform | %v", gs)
+
+ err = <-appendGenQueue(gs).GenEnded()
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ } else {
+ http.Error(w, "OK", http.StatusOK)
+ }
+}
+
+func performFullResyncHandler(w http.ResponseWriter, r *http.Request) {
+ log.Printf("POST /full-resync started")
+
+ waitList := genAll()
+ var errs string
+ for _, e := range waitList {
+ err := <-e
+ if err != nil {
+ errs += err.Error() + "\n"
+ }
+ }
+
+ if errs != "" {
+ lastRegeneration = time.Now()
+ http.Error(w, errs, http.StatusInternalServerError)
+ } else {
+ http.Error(w, "done", http.StatusOK)
+ }
+
+ log.Printf("POST /full-resync done")
+}
+
+func appendGenQueue(gs fic.GenStruct) *fic.GenStruct {
+ if gs.Type == fic.GenTeam || gs.Type == fic.GenTeamIssues {
+ genQueue <- &gs
+ return &gs
+ }
+
// Append only if not already in queue
inQueueMutex.RLock()
if v, ok := inGenQueue[gs.Type]; !ok || !v {
@@ -62,10 +105,12 @@ func appendGenQueue(gs fic.GenStruct) {
inGenQueue[gs.Type] = true
inQueueMutex.Unlock()
- genQueue <- gs
+ genQueue <- &gs
} else {
inQueueMutex.RUnlock()
}
+
+ return &gs
}
func consumer() {
@@ -98,6 +143,7 @@ func consumer() {
if err != nil {
log.Println(id, "[ERR] Unable to generate:", err)
}
+ gs.End(err)
}
}
@@ -263,18 +309,26 @@ func genThemesFile() error {
return nil
}
-func genAll() {
- appendGenQueue(fic.GenStruct{Type: fic.GenThemes})
- appendGenQueue(fic.GenStruct{Type: fic.GenTeams})
- appendGenQueue(fic.GenStruct{Type: fic.GenEvents})
- appendGenQueue(fic.GenStruct{Type: fic.GenPublic})
+func genAll() (waitList []chan error) {
+ waitList = append(
+ waitList,
+ appendGenQueue(fic.GenStruct{Type: fic.GenThemes}).GenEnded(),
+ appendGenQueue(fic.GenStruct{Type: fic.GenTeams}).GenEnded(),
+ appendGenQueue(fic.GenStruct{Type: fic.GenEvents}).GenEnded(),
+ appendGenQueue(fic.GenStruct{Type: fic.GenPublic}).GenEnded(),
+ )
if teams, err := fic.GetActiveTeams(); err != nil {
log.Println("Team retrieval error: ", err)
} else {
for _, team := range teams {
- appendGenQueue(fic.GenStruct{Type: fic.GenTeam, TeamId: team.Id})
- appendGenQueue(fic.GenStruct{Type: fic.GenTeamIssues, TeamId: team.Id})
+ waitList = append(
+ waitList,
+ appendGenQueue(fic.GenStruct{Type: fic.GenTeam, TeamId: team.Id}).GenEnded(),
+ appendGenQueue(fic.GenStruct{Type: fic.GenTeamIssues, TeamId: team.Id}).GenEnded(),
+ )
}
}
+
+ return
}
diff --git a/generator/main.go b/generator/main.go
index 5e3016c4..b457021b 100644
--- a/generator/main.go
+++ b/generator/main.go
@@ -29,7 +29,7 @@ func reloadSettings(config *settings.Settings) {
fic.WChoiceCoefficient = config.WChoiceCurCoefficient
fic.ExerciceCurrentCoefficient = config.ExerciceCurCoefficient
ChStarted = config.Start.Unix() > 0 && time.Since(config.Start) >= 0
- if lastRegeneration != config.Generation || fic.PartialValidation != config.PartialValidation || fic.UnlockedChallengeDepth != config.UnlockedChallengeDepth || fic.UnlockedChallengeUpTo != config.UnlockedChallengeUpTo || fic.DisplayAllFlags != config.DisplayAllFlags || fic.FirstBlood != config.FirstBlood || fic.SubmissionCostBase != config.SubmissionCostBase || fic.SubmissionUniqueness != config.SubmissionUniqueness || fic.DiscountedFactor != config.DiscountedFactor {
+ if fic.PartialValidation != config.PartialValidation || fic.UnlockedChallengeDepth != config.UnlockedChallengeDepth || fic.UnlockedChallengeUpTo != config.UnlockedChallengeUpTo || fic.DisplayAllFlags != config.DisplayAllFlags || fic.FirstBlood != config.FirstBlood || fic.SubmissionCostBase != config.SubmissionCostBase || fic.SubmissionUniqueness != config.SubmissionUniqueness || fic.DiscountedFactor != config.DiscountedFactor {
fic.PartialValidation = config.PartialValidation
fic.UnlockedChallengeDepth = config.UnlockedChallengeDepth
fic.UnlockedChallengeUpTo = config.UnlockedChallengeUpTo
@@ -45,14 +45,17 @@ func reloadSettings(config *settings.Settings) {
if !skipInitialGeneration {
log.Println("Generating files...")
go func() {
- genAll()
+ waitList := genAll()
+ for _, e := range waitList {
+ <-e
+ }
log.Println("Full generation done")
}()
+ lastRegeneration = time.Now()
} else {
skipInitialGeneration = false
log.Println("Regeneration skipped by option.")
}
- lastRegeneration = config.Generation
} else {
log.Println("No change found. Skipping regeneration.")
}
@@ -105,6 +108,8 @@ func main() {
}
http.HandleFunc("/enqueue", enqueueHandler)
+ http.HandleFunc("/perform", performHandler)
+ http.HandleFunc("/full", performFullResyncHandler)
// Serve pages
go func() {
diff --git a/libfic/generation.go b/libfic/generation.go
index 262c9d28..b78c3183 100644
--- a/libfic/generation.go
+++ b/libfic/generation.go
@@ -15,4 +15,20 @@ type GenStruct struct {
Id string `json:"id"`
Type GenerateType `json:"type"`
TeamId int64 `json:"team_id,omitempty"`
+ ended chan error
+}
+
+func (gs *GenStruct) GenEnded() chan error {
+ gs.ended = make(chan error, 1)
+ return gs.ended
+}
+
+func (gs *GenStruct) GetEnded() chan error {
+ return gs.ended
+}
+
+func (gs *GenStruct) End(err error) {
+ if gs.ended != nil {
+ gs.ended <- err
+ }
}
diff --git a/settings/settings.go b/settings/settings.go
index 4d83654e..f69f09a0 100644
--- a/settings/settings.go
+++ b/settings/settings.go
@@ -29,8 +29,6 @@ type Settings struct {
Start time.Time `json:"start"`
// End is the expected end time (if empty their is no end-date).
End *time.Time `json:"end,omitempty"`
- // Generation is a value used to regenerate static files.
- Generation time.Time `json:"generation"`
// ActivateTime is the time when the current file should be proceed.
ActivateTime time.Time `json:"activateTime"`
@@ -130,17 +128,6 @@ func SaveSettings(path string, s interface{}) error {
}
}
-// ForceRegeneration makes a small change to the settings structure in order to force the regeneration of all static files.
-func ForceRegeneration() error {
- location := path.Join(SettingsDir, SettingsFile)
- if settings, err := ReadSettings(location); err != nil {
- return err
- } else {
- settings.Generation = time.Now()
- return SaveSettings(location, settings)
- }
-}
-
// LoadAndWatchSettings is the function you are looking for!
// Giving the location and a callback, this function will first call your reload function
// before returning (if the file can be parsed); then it starts watching modifications made to