beenull/listmonk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Load env config before DB initialisation

Browse source
This commit is contained in:
Kailash Nadh 2020-08-07 18:08:24 +05:30
parent 8979a2ad0b
commit 16e47dddc1
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
main.go
View file

@ -79,6 +79,14 @@ func init() {
// Load config files to pick up the database settings first. // Load config files to pick up the database settings first.
initConfigFiles(ko.Strings("config"), ko) initConfigFiles(ko.Strings("config"), ko)
// Load environment variables and merge into the loaded config.
if err := ko.Load(env.Provider("LISTMONK_", ".", func(s string) string {
return strings.Replace(strings.ToLower(
strings.TrimPrefix(s, "LISTMONK_")), "__", ".", -1)
}), nil); err != nil {
lo.Fatalf("error loading config from env: %v", err)
}
// Connect to the database, load the filesystem to read SQL queries. // Connect to the database, load the filesystem to read SQL queries.
db = initDB() db = initDB()
fs = initFS(ko.String("static-dir")) fs = initFS(ko.String("static-dir"))
@ -104,13 +112,6 @@ func init() {
// Load settings from DB. // Load settings from DB.
initSettings(queries) initSettings(queries)
// Load environment variables and merge into the loaded config.
if err := ko.Load(env.Provider("LISTMONK_", ".", func(s string) string {
return strings.Replace(strings.ToLower(
strings.TrimPrefix(s, "LISTMONK_")), "__", ".", -1)
}), nil); err != nil {
lo.Fatalf("error loading config from env: %v", err)
}
} }
func main() { func main() {