1
0
mirror of https://github.com/muety/wakapi.git synced 2023-08-10 21:12:56 +03:00

fix: proper parsing of environment variables

This commit is contained in:
Ferdinand Mütsch
2020-04-26 13:55:19 +02:00
parent 7b486b390e
commit 91a4bb2db3
4 changed files with 22 additions and 15 deletions

19
main.go
View File

@@ -40,20 +40,15 @@ func readConfig() *models.Config {
log.Fatal(err)
}
// TODO: Use jinzhu/configor or so
env, _ := os.LookupEnv("ENV")
dbType, valid := os.LookupEnv("WAKAPI_DB_TYPE")
dbUser, valid := os.LookupEnv("WAKAPI_DB_USER")
dbPassword, valid := os.LookupEnv("WAKAPI_DB_PASSWORD")
dbHost, valid := os.LookupEnv("WAKAPI_DB_HOST")
dbName, valid := os.LookupEnv("WAKAPI_DB_NAME")
dbPortStr, valid := os.LookupEnv("WAKAPI_DB_PORT")
env := utils.LookupFatal("ENV")
dbType := utils.LookupFatal("WAKAPI_DB_TYPE")
dbUser := utils.LookupFatal("WAKAPI_DB_USER")
dbPassword := utils.LookupFatal("WAKAPI_DB_PASSWORD")
dbHost := utils.LookupFatal("WAKAPI_DB_HOST")
dbName := utils.LookupFatal("WAKAPI_DB_NAME")
dbPortStr := utils.LookupFatal("WAKAPI_DB_PORT")
dbPort, err := strconv.Atoi(dbPortStr)
if !valid {
log.Fatal("Environment variables missing or invalid.")
}
cfg, err := ini.Load("config.ini")
if err != nil {
log.Fatalf("Fail to read file: %v", err)