fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Define global default value at initialisation

Browse source
This commit is contained in:
nemunaire 2017-11-25 16:05:03 +01:00 • committed by Pierre-Olivier Mercier
commit cd5a9d06ea
9 changed files with 31 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
backend/main.go
View file

@ -17,7 +17,6 @@ import (
)
var TeamsDir string
var SettingsDir string
var SubmissionDir string
func watchsubdir(watcher *fsnotify.Watcher, pathname string) error {
@ -67,7 +66,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(&settings.SettingsDir, "settings", settings.SettingsDir, "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")
@ -76,7 +75,7 @@ func main() {
log.SetPrefix("[backend] ")
SettingsDir = path.Clean(SettingsDir)
settings.SettingsDir = path.Clean(settings.SettingsDir)
SubmissionDir = path.Clean(SubmissionDir)
TeamsDir = path.Clean(TeamsDir)
@ -96,7 +95,7 @@ func main() {
defer fic.DBClose()
// Load configuration
settings.LoadAndWatchSettings(path.Join(SettingsDir, settings.SettingsFile), reloadSettings)
settings.LoadAndWatchSettings(path.Join(settings.SettingsDir, settings.SettingsFile), reloadSettings)
log.Println("Registering directory events...")
watcher, err := fsnotify.NewWatcher()