evdist: Retactor + include dashboard lookup
This commit is contained in:
parent
d44fc4f715
commit
5592fabefa
6 changed files with 336 additions and 178 deletions
|
|
@ -1,134 +1,100 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"sync"
|
||||
"os"
|
||||
"path"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"srs.epita.fr/fic-server/settings"
|
||||
)
|
||||
|
||||
// distList maintain a nextSettingsFile list up-to-date.
|
||||
type distList struct {
|
||||
List []*settings.NextSettingsFile
|
||||
Lock sync.RWMutex
|
||||
Timer *time.Timer
|
||||
}
|
||||
|
||||
// NewDistList creates a distList from the given src directory
|
||||
func NewDistList(src string) (*distList, error) {
|
||||
func NewSettingsDistList(src string) (*distList, error) {
|
||||
list, err := settings.ListNextSettingsFiles()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &distList{List: list, Timer: time.NewTimer(time.Minute)}, nil
|
||||
|
||||
var dlist []DistEvent
|
||||
for _, e := range list {
|
||||
dlist = append(dlist, e)
|
||||
}
|
||||
|
||||
return &distList{List: dlist, Timer: time.NewTimer(time.Minute)}, nil
|
||||
}
|
||||
|
||||
func (l *distList) TimerNextEvent() *time.Timer {
|
||||
l.Lock.RLock()
|
||||
defer l.Lock.RUnlock()
|
||||
|
||||
var min *time.Time
|
||||
|
||||
for _, f := range l.List {
|
||||
if min == nil || f.Date.Before(*min) {
|
||||
min = &f.Date
|
||||
}
|
||||
}
|
||||
|
||||
if min == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
if min == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
return time.NewTimer(time.Until(*min))
|
||||
func parseSettingsFilename(fname string) (int64, error) {
|
||||
return strconv.ParseInt(strings.TrimSuffix(fname, ".json"), 10, 64)
|
||||
}
|
||||
|
||||
func (l *distList) AddEvent(nsf *settings.NextSettingsFile) {
|
||||
l.Lock.Lock()
|
||||
func newSettingsFile(l *distList, raw_path string) {
|
||||
bpath := path.Base(raw_path)
|
||||
|
||||
istop := len(l.List)
|
||||
for i, n := range l.List {
|
||||
if n.Id == nsf.Id {
|
||||
if bpath == "challenge.json" || bpath == "settings.json" {
|
||||
log.Printf("Copying %s to SETTINGDIST...", bpath)
|
||||
// Copy content through tmp file
|
||||
fd, err := os.Open(raw_path)
|
||||
if err != nil {
|
||||
log.Printf("ERROR: Unable to open %s: %s", raw_path, err.Error())
|
||||
return
|
||||
} else if n.Date.After(nsf.Date) {
|
||||
istop = i
|
||||
break
|
||||
}
|
||||
}
|
||||
defer fd.Close()
|
||||
|
||||
l.List = append(l.List, nsf)
|
||||
copy(l.List[istop+1:], l.List[istop:])
|
||||
l.List[istop] = nsf
|
||||
|
||||
l.Lock.Unlock()
|
||||
|
||||
if istop == 0 {
|
||||
l.ResetTimer()
|
||||
}
|
||||
}
|
||||
|
||||
func (l *distList) DelEvent(id int64) {
|
||||
l.Lock.Lock()
|
||||
|
||||
istop := len(l.List)
|
||||
for i, n := range l.List {
|
||||
if n.Id == id {
|
||||
istop = i
|
||||
break
|
||||
tmpfile, err := ioutil.TempFile(TmpSettingsDistDirectory, "")
|
||||
if err != nil {
|
||||
log.Printf("ERROR: Unable to create temporary file for %s: %s", bpath, err.Error())
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if istop == len(l.List)-1 {
|
||||
l.List = l.List[:istop]
|
||||
} else if istop != len(l.List) {
|
||||
l.List = append(l.List[:istop], l.List[istop+1:]...)
|
||||
}
|
||||
_, err = io.Copy(tmpfile, fd)
|
||||
tmpfile.Close()
|
||||
|
||||
l.Lock.Unlock()
|
||||
if err != nil {
|
||||
log.Printf("ERROR: Unable to copy content to temporary file (%s): %s", bpath, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
if istop == 0 {
|
||||
l.ResetTimer()
|
||||
}
|
||||
}
|
||||
os.Chmod(tmpfile.Name(), 0644)
|
||||
|
||||
func (l *distList) ResetTimer() {
|
||||
l.Lock.RLock()
|
||||
defer l.Lock.RUnlock()
|
||||
if err = os.Rename(tmpfile.Name(), path.Join(SettingsDistDir, bpath)); err != nil {
|
||||
log.Println("ERROR: Unable to move file:", err)
|
||||
return
|
||||
}
|
||||
} else if ts, err := parseSettingsFilename(bpath); err == nil {
|
||||
activateTime := time.Unix(ts, 0)
|
||||
|
||||
if len(l.List) == 0 {
|
||||
l.Timer.Reset(time.Minute)
|
||||
log.Printf("Preparing %s: activation time at %s", bpath, activateTime)
|
||||
|
||||
l.AddEvent(&settings.NextSettingsFile{
|
||||
Id: ts,
|
||||
Date: activateTime,
|
||||
})
|
||||
} else {
|
||||
l.Timer.Reset(time.Until(l.List[0].Date))
|
||||
log.Println("WARNING: Unknown file to treat: not a valid timestamp:", err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
func (l *distList) Pop() *settings.NextSettingsFile {
|
||||
l.Lock.Lock()
|
||||
defer l.Lock.Unlock()
|
||||
func treatSettingsFile(e DistEvent) {
|
||||
v, err := settings.ReadNextSettingsFile(path.Join(settings.SettingsDir, fmt.Sprintf("%d.json", e.GetId())), e.GetId())
|
||||
if err != nil {
|
||||
log.Printf("Unable to read json: %s", err.Error())
|
||||
} else if cur_settings, err := settings.ReadSettings(path.Join(settings.SettingsDir, settings.SettingsFile)); err != nil {
|
||||
log.Printf("Unable to read settings.json: %s", err.Error())
|
||||
} else {
|
||||
cur_settings = settings.MergeSettings(*cur_settings, v.Values)
|
||||
|
||||
if len(l.List) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
if time.Now().Before(l.List[0].Date) {
|
||||
return nil
|
||||
}
|
||||
|
||||
ret := l.List[0]
|
||||
l.List = l.List[1:]
|
||||
return ret
|
||||
}
|
||||
|
||||
func (l *distList) Print() {
|
||||
l.Lock.RLock()
|
||||
defer l.Lock.RUnlock()
|
||||
|
||||
log.Println("Seeing distlist")
|
||||
for n, i := range l.List {
|
||||
log.Printf("#%d: %v", n, *i)
|
||||
if err = settings.SaveSettings(path.Join(TmpSettingsDirectory, "settings.json"), cur_settings); err != nil {
|
||||
log.Printf("Unable to save settings.json to tmp dir: %s", err.Error())
|
||||
} else if err = os.Rename(path.Join(TmpSettingsDirectory, "settings.json"), path.Join(settings.SettingsDir, "settings.json")); err != nil {
|
||||
log.Printf("Unable to move settings.json to dest dir: %s", err.Error())
|
||||
} else if err = os.Remove(path.Join(settings.SettingsDir, fmt.Sprintf("%d.json", v.Id))); err != nil {
|
||||
log.Printf("Unable to remove initial diff file (%d.json): %s", v.Id, err.Error())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue