Move settings and started file into SETTINGS directory

This commit is contained in:
nemunaire 2017-11-22 02:00:40 +01:00 committed by Pierre-Olivier Mercier
parent 31d98285a4
commit f17541e252
7 changed files with 22 additions and 10 deletions

View file

@ -17,6 +17,7 @@ import (
)
var TeamsDir string
var SettingsDir string
var SubmissionDir string
func watchsubdir(watcher *fsnotify.Watcher, pathname string) error {
@ -66,6 +67,7 @@ func reloadSettings(config settings.FICSettings) {
func main() {
var dsn = flag.String("dsn", fic.DSNGenerator(), "DSN to connect to the MySQL server")
flag.StringVar(&SettingsDir, "settings", "./SETTINGS", "Base directory where load and save settings")
flag.StringVar(&SubmissionDir, "submission", "./submissions", "Base directory where save submissions")
flag.StringVar(&TeamsDir, "teams", "./TEAMS", "Base directory where save teams JSON files")
flag.StringVar(&fic.FilesDir, "files", "/files", "Request path prefix to reach files")
@ -73,6 +75,7 @@ func main() {
log.SetPrefix("[backend] ")
SettingsDir = path.Clean(SettingsDir)
SubmissionDir = path.Clean(SubmissionDir)
TeamsDir = path.Clean(TeamsDir)
@ -92,7 +95,7 @@ func main() {
defer fic.DBClose()
// Load configuration
settings.LoadAndWatchSettings(path.Join(TeamsDir, settings.SettingsFile), reloadSettings)
settings.LoadAndWatchSettings(path.Join(SettingsDir, settings.SettingsFile), reloadSettings)
log.Println("Registering directory events...")
watcher, err := fsnotify.NewWatcher()