muffin/goMuffin
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases 3 Packages Wiki Activity Actions

chore: edit config struct

Browse source
This commit is contained in:
Siwoo Jeon 2025-05-11 13:51:26 +09:00
parent f69b3f13a3
commit 5f881b4ec5
Signed by: migan
GPG key ID: 036E9A8C5E8E48DA
3 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
configs/config.go
View file

@ -23,21 +23,21 @@ type MuffinConfig struct {
Bot botConfig Bot botConfig
Train trainConfig Train trainConfig
DatabaseURL string DatabaseURL string
DBName string DatabaseName string
} }
func loadConfig() *MuffinConfig { var Config *MuffinConfig
godotenv.Load()
config := &MuffinConfig{Bot: botConfig{}, Train: trainConfig{}}
setConfig(config)
return config func init() {
godotenv.Load()
Config = &MuffinConfig{Bot: botConfig{}, Train: trainConfig{}}
setConfig(Config)
} }
func getRequiredValue(key string) string { func getRequiredValue(key string) string {
value := os.Getenv(key) value := os.Getenv(key)
if value == "" { if value == "" {
log.Fatalln(fmt.Sprintf("[goMuffin] .env 파일에서 필요한 %s값이 없어요.", key)) log.Fatalln(fmt.Sprintf("[goMuffin] .env 파일에서 필요한 '%s'값이 없어요.", key))
} }
return value return value
} }
@ -54,7 +54,5 @@ func setConfig(config *MuffinConfig) {
config.Train.UserID = getValue("TRAIN_USER_ID") config.Train.UserID = getValue("TRAIN_USER_ID")
config.DatabaseURL = getRequiredValue("DATABASE_URL") config.DatabaseURL = getRequiredValue("DATABASE_URL")
config.DBName = getRequiredValue("DATABASE_NAME") config.DatabaseName = getRequiredValue("DATABASE_NAME")
} }
var Config *MuffinConfig = loadConfig()

4
databases/database.go
View file

@ -32,7 +32,7 @@ func Connect() (*MuffinDatabase, error) {
} }
return &MuffinDatabase{ return &MuffinDatabase{
Client: client, Client: client,
Learns: client.Database(configs.Config.DBName).Collection("learn"), Learns: client.Database(configs.Config.DatabaseName).Collection("learn"),
Texts: client.Database(configs.Config.DBName).Collection("text"), Texts: client.Database(configs.Config.DatabaseName).Collection("text"),
}, nil }, nil
} }

2
scripts/dbMigrate.go
View file

@ -23,7 +23,7 @@ var wg sync.WaitGroup
func DBMigrate(n *commando.Node) error { func DBMigrate(n *commando.Node) error {
mariaURL := os.Getenv("PREVIOUS_DATABASE_URL") mariaURL := os.Getenv("PREVIOUS_DATABASE_URL")
mongoURL := configs.Config.DatabaseURL mongoURL := configs.Config.DatabaseURL
dbName := configs.Config.DBName dbName := configs.Config.DatabaseName
dbConnectionQuery := "?parseTime=true" dbConnectionQuery := "?parseTime=true"