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

fix!: remove deprecated value in MuffinConfig

Browse source
This commit is contained in:
Siwoo Jeon 2025-05-17 21:12:14 +09:00
parent 63a820f946
commit 5f0bb32e9b
Signed by: migan
GPG key ID: 036E9A8C5E8E48DA
3 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configs/config.go
View file

@ -34,12 +34,6 @@ type MuffinConfig struct {
Bot botConfig Bot botConfig
Train trainConfig Train trainConfig
Database databaseConfig Database databaseConfig
// Deprecated: Use Database.URL
DatabaseURL string
// Deprecated: Use Database.Name
DatabaseName string
} }
var Config *MuffinConfig var Config *MuffinConfig
@ -90,8 +84,4 @@ func setConfig(config *MuffinConfig) {
if config.Database.URL == "" { if config.Database.URL == "" {
config.Database.URL = fmt.Sprintf("mongodb://%s:%s@%s:%d/?authSource=%s", config.Database.Username, config.Database.Password, config.Database.HostName, config.Database.Port, config.Database.AuthSource) config.Database.URL = fmt.Sprintf("mongodb://%s:%s@%s:%d/?authSource=%s", config.Database.Username, config.Database.Password, config.Database.HostName, config.Database.Port, config.Database.AuthSource)
} }
// Deprecated된 Value
config.DatabaseURL = config.Database.URL
config.DatabaseName = config.Database.Name
} }

6
databases/database.go
View file

@ -26,13 +26,13 @@ func init() {
} }
func Connect() (*MuffinDatabase, error) { func Connect() (*MuffinDatabase, error) {
client, err := mongo.Connect(options.Client().ApplyURI(configs.Config.DatabaseURL)) client, err := mongo.Connect(options.Client().ApplyURI(configs.Config.Database.URL))
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &MuffinDatabase{ return &MuffinDatabase{
Client: client, Client: client,
Learns: client.Database(configs.Config.DatabaseName).Collection("learn"), Learns: client.Database(configs.Config.Database.Name).Collection("learn"),
Texts: client.Database(configs.Config.DatabaseName).Collection("text"), Texts: client.Database(configs.Config.Database.Name).Collection("text"),
}, nil }, nil
} }

4
scripts/dbMigrate.go
View file

@ -22,8 +22,8 @@ var wg sync.WaitGroup
// 이 스크립트는 MariaDB -> MongoDB로의 전환을 위해 만들었음. // 이 스크립트는 MariaDB -> MongoDB로의 전환을 위해 만들었음.
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.Database.URL
dbName := configs.Config.DatabaseName dbName := configs.Config.Database.Name
dbConnectionQuery := "?parseTime=true" dbConnectionQuery := "?parseTime=true"