chore: edit config struct
This commit is contained in:
parent
f69b3f13a3
commit
5f881b4ec5
3 changed files with 14 additions and 16 deletions
|
@ -23,21 +23,21 @@ type MuffinConfig struct {
|
|||
Bot botConfig
|
||||
Train trainConfig
|
||||
DatabaseURL string
|
||||
DBName 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()
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
Loading…
Reference in a new issue