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

frontend: light treatment on prefix to avoid multiple /

Browse source
This commit is contained in:
nemunaire 2017-11-22 02:19:03 +01:00 • committed by Pierre-Olivier Mercier
parent f17541e252
commit 3f13d81eb3
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
frontend/main.go
View file

@ -7,6 +7,7 @@ import (
"net/http" "net/http"
"os" "os"
"path" "path"
"strings"
fronttime "srs.epita.fr/fic-server/frontend/time" fronttime "srs.epita.fr/fic-server/frontend/time"
"srs.epita.fr/fic-server/settings" "srs.epita.fr/fic-server/settings"
@ -14,7 +15,7 @@ import (
func main() { func main() {
var bind = flag.String("bind", "127.0.0.1:8080", "Bind port/socket") var bind = flag.String("bind", "127.0.0.1:8080", "Bind port/socket")
var prefix = flag.String("prefix", "", "Request path prefix to strip (from proxy)") var prefix = flag.String("prefix", "/", "Request path prefix to strip (from proxy)")
var teamsDir = flag.String("teams", "./TEAMS/", "Base directory where find existing teams") var teamsDir = flag.String("teams", "./TEAMS/", "Base directory where find existing teams")
flag.StringVar(&SettingsDir, "settings", "./SETTINGS/", "Base directory where load and save settings") flag.StringVar(&SettingsDir, "settings", "./SETTINGS/", "Base directory where load and save settings")
flag.StringVar(&SubmissionDir, "submission", "./submissions/", "Base directory where save submissions") flag.StringVar(&SubmissionDir, "submission", "./submissions/", "Base directory where save submissions")
@ -32,6 +33,8 @@ func main() {
} }
} }
*prefix = strings.TrimRight(*prefix, "/")
// Load configuration // Load configuration
settings.LoadAndWatchSettings(path.Join(SettingsDir, settings.SettingsFile), reloadSettings) settings.LoadAndWatchSettings(path.Join(SettingsDir, settings.SettingsFile), reloadSettings)