diff --git a/configs/config.go b/configs/config.go index a10ecef..3dc46d5 100644 --- a/configs/config.go +++ b/configs/config.go @@ -20,24 +20,24 @@ type trainConfig struct { // MuffinConfig for Muffin bot type MuffinConfig struct { - Bot botConfig - Train trainConfig - DatabaseURL string - DBName string + Bot botConfig + Train trainConfig + DatabaseURL string + DatabaseName string } -func loadConfig() *MuffinConfig { - godotenv.Load() - config := &MuffinConfig{Bot: botConfig{}, Train: trainConfig{}} - setConfig(config) +var Config *MuffinConfig - return config +func init() { + godotenv.Load() + Config = &MuffinConfig{Bot: botConfig{}, Train: trainConfig{}} + setConfig(Config) } func getRequiredValue(key string) string { value := os.Getenv(key) if value == "" { - log.Fatalln(fmt.Sprintf("[goMuffin] .env 파일에서 필요한 %s값이 없어요.", key)) + log.Fatalln(fmt.Sprintf("[goMuffin] .env 파일에서 필요한 '%s'값이 없어요.", key)) } return value } @@ -54,7 +54,5 @@ func setConfig(config *MuffinConfig) { config.Train.UserID = getValue("TRAIN_USER_ID") config.DatabaseURL = getRequiredValue("DATABASE_URL") - config.DBName = getRequiredValue("DATABASE_NAME") + config.DatabaseName = getRequiredValue("DATABASE_NAME") } - -var Config *MuffinConfig = loadConfig() diff --git a/databases/database.go b/databases/database.go index 7928bdc..26a6607 100644 --- a/databases/database.go +++ b/databases/database.go @@ -32,7 +32,7 @@ func Connect() (*MuffinDatabase, error) { } return &MuffinDatabase{ Client: client, - Learns: client.Database(configs.Config.DBName).Collection("learn"), - Texts: client.Database(configs.Config.DBName).Collection("text"), + Learns: client.Database(configs.Config.DatabaseName).Collection("learn"), + Texts: client.Database(configs.Config.DatabaseName).Collection("text"), }, nil } diff --git a/scripts/dbMigrate.go b/scripts/dbMigrate.go index 60f8192..f06569c 100644 --- a/scripts/dbMigrate.go +++ b/scripts/dbMigrate.go @@ -23,7 +23,7 @@ var wg sync.WaitGroup func DBMigrate(n *commando.Node) error { mariaURL := os.Getenv("PREVIOUS_DATABASE_URL") mongoURL := configs.Config.DatabaseURL - dbName := configs.Config.DBName + dbName := configs.Config.DatabaseName dbConnectionQuery := "?parseTime=true"