Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions libs/go/meowbot/feature/db/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,14 @@ func InitDB(ctx context.Context) error {
} else {
user := util.Cfg.DatabaseUser
pass := util.Cfg.DatabasePassword
url := util.Cfg.DatabaseURL

connStr = fmt.Sprintf("postgres://%s:%s@%s", user, pass, url)
host := util.Cfg.DatabaseHost
port := util.Cfg.DatabasePort
name := util.Cfg.DatabaseName

connStr = fmt.Sprintf(
"postgres://%s:%s@%s:%s/%s",
user, pass, host, port, name,
)
}

// Open the database connection
Expand Down
6 changes: 6 additions & 0 deletions libs/go/meowbot/util/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ type AppConfig struct {
DatabaseURL string
DatabaseUser string
DatabasePassword string
DatabaseHost string
DatabasePort string
DatabaseName string
EmojiList string
Logger *slog.Logger
Whitelist struct {
Expand Down Expand Up @@ -62,6 +65,9 @@ func LoadConfig() AppConfig {
DatabaseURL: os.Getenv("DATABASE_URL"),
DatabaseUser: os.Getenv("DATABASE_USER"),
DatabasePassword: os.Getenv("DATABASE_PASSWORD"),
DatabaseHost: os.Getenv("DATABASE_HOST"),
DatabasePort: os.Getenv("DATABASE_PORT"),
DatabaseName: os.Getenv("DATABASE_NAME"),
EmojiList: os.Getenv("EMOJI_LIST"),
Logger: logger,
Whitelist: struct {
Expand Down