Ivan/commento
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: add COMMENTO_BIND_ADDRESS variable

Browse Source 
Signed-off-by: Pierre-Alain TORET <pierre-alain.toret@protonmail.com>
This commit is contained in:
Pierre-Alain TORET 2018-06-09 23:19:19 +02:00 committed by daftaupe
parent 684734cb29
commit 73d04bf857
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/config.go
View File

@ -16,6 +16,7 @@ func parseConfig() error {
defaults := map[string]string{ defaults := map[string]string{
"POSTGRES": "postgres://postgres:postgres@localhost/commento?sslmode=disable", "POSTGRES": "postgres://postgres:postgres@localhost/commento?sslmode=disable",
"BIND_ADDRESS": "127.0.0.1",
"PORT": "8080", "PORT": "8080",
"ORIGIN": "", "ORIGIN": "",

17
api/config_test.go
View File

@ -14,6 +14,23 @@ func TestParseConfigBasics(t *testing.T) {
return return
} }
if os.Getenv("BIND_ADDRESS") != "127.0.0.1" {
t.Errorf("expected BIND_ADDRESS=127.0.0.1, but BIND_ADDRESS=%s instead", os.Getenv("BIND_ADDRESS"))
return
}
os.Setenv("COMMENTO_BIND_ADDRESS", "192.168.1.100")
if err := parseConfig(); err != nil {
t.Errorf("unexpected error when parsing config: %v", err)
return
}
if os.Getenv("BIND_ADDRESS") != "192.168.1.100" {
t.Errorf("expected BIND_ADDRESS=192.168.1.100, but BIND_ADDRESS=%s instead", os.Getenv("BIND_ADDRESS"))
return
}
// This test feels kinda stupid, but whatever. // This test feels kinda stupid, but whatever.
if os.Getenv("PORT") != "8080" { if os.Getenv("PORT") != "8080" {
t.Errorf("expected PORT=8080, but PORT=%s instead", os.Getenv("PORT")) t.Errorf("expected PORT=8080, but PORT=%s instead", os.Getenv("PORT"))

6
api/router.go
View File

@ -22,8 +22,10 @@ func serveRoutes() error {
headers := handlers.AllowedHeaders([]string{"X-Requested-With"}) headers := handlers.AllowedHeaders([]string{"X-Requested-With"})
methods := handlers.AllowedMethods([]string{"GET", "POST"}) methods := handlers.AllowedMethods([]string{"GET", "POST"})
logger.Infof("starting server on port %s\n", os.Getenv("PORT")) addrPort := os.Getenv("BIND_ADDRESS") + ":" + os.Getenv("PORT")
if err := http.ListenAndServe(":"+os.Getenv("PORT"), handlers.CORS(origins, headers, methods)(router)); err != nil {
logger.Infof("starting server on %s\n", addrPort)
if err := http.ListenAndServe(addrPort, handlers.CORS(origins, headers, methods)(router)); err != nil {
logger.Errorf("cannot start server: %v", err) logger.Errorf("cannot start server: %v", err)
return err return err
} }