evdist: New project to handle settings programming
This commit is contained in:
parent
0831ea6088
commit
af6e86d4ef
9 changed files with 384 additions and 11 deletions
1
evdist/.gitignore
vendored
Normal file
1
evdist/.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
evdist
|
||||
169
evdist/main.go
Normal file
169
evdist/main.go
Normal file
|
|
@ -0,0 +1,169 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"os"
|
||||
"path"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"srs.epita.fr/fic-server/settings"
|
||||
|
||||
"gopkg.in/fsnotify.v1"
|
||||
)
|
||||
|
||||
var SettingsDistDir = "./SETTINGSDIST/"
|
||||
var TmpSettingsDirectory string
|
||||
var TmpSettingsDistDirectory string
|
||||
|
||||
func watchsubdir(l *distList, watcher *fsnotify.Watcher, pathname string) error {
|
||||
log.Println("Watch new directory:", pathname)
|
||||
if err := watcher.Add(pathname); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if ds, err := ioutil.ReadDir(pathname); err != nil {
|
||||
return err
|
||||
} else {
|
||||
for _, d := range ds {
|
||||
p := path.Join(pathname, d.Name())
|
||||
if d.Mode().IsRegular() && d.Name() != ".tmp" {
|
||||
l.treat(p)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func main() {
|
||||
flag.StringVar(&settings.SettingsDir, "settings", settings.SettingsDir, "Base directory where read settings")
|
||||
flag.StringVar(&SettingsDistDir, "settingsDist", SettingsDistDir, "Directory where place settings to distribute")
|
||||
var debugINotify = flag.Bool("debuginotify", false, "Show skipped inotofy events")
|
||||
flag.Parse()
|
||||
|
||||
log.SetPrefix("[evdist] ")
|
||||
|
||||
settings.SettingsDir = path.Clean(settings.SettingsDir)
|
||||
|
||||
log.Println("Creating settingsDist directory...")
|
||||
TmpSettingsDistDirectory = path.Join(SettingsDistDir, ".tmp")
|
||||
if _, err := os.Stat(TmpSettingsDistDirectory); os.IsNotExist(err) {
|
||||
if err = os.MkdirAll(TmpSettingsDistDirectory, 0755); err != nil {
|
||||
log.Fatal("Unable to create settingsdist directory:", err)
|
||||
}
|
||||
}
|
||||
|
||||
TmpSettingsDirectory = path.Join(settings.SettingsDir, ".tmp")
|
||||
if _, err := os.Stat(TmpSettingsDirectory); os.IsNotExist(err) {
|
||||
if err = os.MkdirAll(TmpSettingsDirectory, 0755); err != nil {
|
||||
log.Fatal("Unable to create settings directory:", err)
|
||||
}
|
||||
}
|
||||
|
||||
log.Println("Registering directory events...")
|
||||
watcher, err := fsnotify.NewWatcher()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
defer watcher.Close()
|
||||
|
||||
l := &distList{}
|
||||
l.Timer = time.NewTimer(time.Minute)
|
||||
|
||||
if err := watchsubdir(l, watcher, settings.SettingsDir); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
watchedNotify := fsnotify.Create
|
||||
|
||||
for {
|
||||
select {
|
||||
case <-l.Timer.C:
|
||||
if v := l.Pop(); v != nil {
|
||||
log.Printf("TREATING DIFF: %v", v)
|
||||
|
||||
v, err = settings.ReadNextSettingsFile(path.Join(settings.SettingsDir, fmt.Sprintf("%d.json", v.Id)), v.Id)
|
||||
if err != nil {
|
||||
log.Printf("Unable to read %d.json: %s", v.Id, 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 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())
|
||||
}
|
||||
}
|
||||
}
|
||||
l.ResetTimer()
|
||||
case ev := <-watcher.Events:
|
||||
if d, err := os.Lstat(ev.Name); err == nil && ev.Op&watchedNotify == watchedNotify && d.Name() != ".tmp" && d.Mode().IsRegular() {
|
||||
if *debugINotify {
|
||||
log.Println("Treating event:", ev, "for", ev.Name)
|
||||
}
|
||||
go l.treat(ev.Name)
|
||||
} else if ev.Op&fsnotify.Write == fsnotify.Write {
|
||||
log.Println("FSNOTIFY WRITE SEEN. Prefer looking at them, as it appears files are not atomically moved.")
|
||||
watchedNotify = fsnotify.Write
|
||||
} else if *debugINotify {
|
||||
log.Println("Skipped event:", ev, "for", ev.Name)
|
||||
}
|
||||
case err := <-watcher.Errors:
|
||||
log.Println("error:", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (l *distList) treat(raw_path string) {
|
||||
bpath := path.Base(raw_path)
|
||||
|
||||
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
|
||||
}
|
||||
defer fd.Close()
|
||||
|
||||
tmpfile, err := ioutil.TempFile(TmpSettingsDistDirectory, "")
|
||||
if err != nil {
|
||||
log.Printf("ERROR: Unable to create temporary file for %s: %s", bpath, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
_, err = io.Copy(tmpfile, fd)
|
||||
tmpfile.Close()
|
||||
|
||||
if err != nil {
|
||||
log.Printf("ERROR: Unable to copy content to temporary file (%s): %s", bpath, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
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 := strconv.ParseInt(strings.TrimSuffix(bpath, ".json"), 10, 64); err == nil {
|
||||
activateTime := time.Unix(ts, 0)
|
||||
|
||||
log.Printf("Preparing %s: activation time at %s", bpath, activateTime)
|
||||
|
||||
l.AddEvent(&settings.NextSettingsFile{
|
||||
Id: ts,
|
||||
Date: activateTime,
|
||||
})
|
||||
} else {
|
||||
log.Println("WARNING: Unknown file to treat: not a valid timestamp:", err.Error())
|
||||
}
|
||||
}
|
||||
110
evdist/settings.go
Normal file
110
evdist/settings.go
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"log"
|
||||
"sync"
|
||||
"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) {
|
||||
list, err := settings.ListNextSettingsFiles()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &distList{List: list, 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 (l *distList) AddEvent(nsf *settings.NextSettingsFile) {
|
||||
l.Lock.Lock()
|
||||
|
||||
istop := len(l.List)
|
||||
for i, n := range l.List {
|
||||
if n.Id == nsf.Id {
|
||||
return
|
||||
} else if n.Date.After(nsf.Date) {
|
||||
istop = i
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
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) ResetTimer() {
|
||||
l.Lock.RLock()
|
||||
defer l.Lock.RUnlock()
|
||||
|
||||
if len(l.List) == 0 {
|
||||
l.Timer.Reset(time.Minute)
|
||||
} else {
|
||||
l.Timer.Reset(time.Until(l.List[0].Date))
|
||||
}
|
||||
}
|
||||
|
||||
func (l *distList) Pop() *settings.NextSettingsFile {
|
||||
l.Lock.Lock()
|
||||
defer l.Lock.Unlock()
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
||||
Reference in a new issue