evdist: Publish next settings change
This commit is contained in:
parent
357944564b
commit
0db9e9b539
5 changed files with 76 additions and 21 deletions
|
|
@ -12,8 +12,12 @@ import (
|
|||
"time"
|
||||
|
||||
"srs.epita.fr/fic-server/settings"
|
||||
|
||||
"gopkg.in/fsnotify.v1"
|
||||
)
|
||||
|
||||
var PublishNextChangeIndication = true
|
||||
|
||||
// NewDistList creates a distList from the given src directory
|
||||
func NewSettingsDistList(src string) (*distList, error) {
|
||||
list, err := settings.ListNextSettingsFiles()
|
||||
|
|
@ -74,12 +78,33 @@ func newSettingsFile(l *distList, raw_path string) {
|
|||
l.AddEvent(&settings.NextSettingsFile{
|
||||
Id: ts,
|
||||
Date: activateTime,
|
||||
})
|
||||
}, updateNextSettingsTime)
|
||||
} else {
|
||||
log.Println("WARNING: Unknown file to treat: not a valid timestamp:", err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
func saveSettingsFile(cur_settings *settings.Settings) error {
|
||||
if watchedNotify == fsnotify.Create {
|
||||
err := settings.SaveSettings(path.Join(TmpSettingsDirectory, "settings.json"), cur_settings)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Unable to save settings.json to tmp dir: %w", err)
|
||||
}
|
||||
|
||||
err = os.Rename(path.Join(TmpSettingsDirectory, "settings.json"), path.Join(settings.SettingsDir, "settings.json"))
|
||||
if err != nil {
|
||||
return fmt.Errorf("Unable to move settings.json to dest dir: %w", err)
|
||||
}
|
||||
} else {
|
||||
err := settings.SaveSettings(path.Join(settings.SettingsDir, "settings.json"), cur_settings)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Unable to save settings.json to tmp dir: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func treatSettingsFile(e DistEvent) {
|
||||
v, err := settings.ReadNextSettingsFile(path.Join(settings.SettingsDir, fmt.Sprintf("%d.json", e.GetId())), e.GetId())
|
||||
if err != nil {
|
||||
|
|
@ -89,12 +114,38 @@ func treatSettingsFile(e DistEvent) {
|
|||
} 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())
|
||||
if err := saveSettingsFile(cur_settings); err != nil {
|
||||
log.Printf(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())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func updateNextSettingsTime(e DistEvent) {
|
||||
if !PublishNextChangeIndication {
|
||||
return
|
||||
}
|
||||
log.Println("Updating settings.json to include next settings time")
|
||||
|
||||
cur_settings, err := settings.ReadSettings(path.Join(settings.SettingsDir, settings.SettingsFile))
|
||||
if err != nil {
|
||||
log.Printf("Unable to read settings.json: %s", err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
if e == nil {
|
||||
cur_settings = settings.MergeSettings(*cur_settings, map[string]interface{}{
|
||||
"nextchangetime": nil,
|
||||
})
|
||||
} else {
|
||||
cur_settings = settings.MergeSettings(*cur_settings, map[string]interface{}{
|
||||
"nextchangetime": *e.GetDate(),
|
||||
})
|
||||
}
|
||||
|
||||
err = saveSettingsFile(cur_settings)
|
||||
if err != nil {
|
||||
log.Printf(err.Error())
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue