diff --git a/pkg/config.go b/pkg/config.go index aaef13e..6026daf 100644 --- a/pkg/config.go +++ b/pkg/config.go @@ -132,7 +132,7 @@ func getDatabase(database Database) *dbConfig { database.User = getEnvOrDefault(database.User, "DB_USERNAME", database.Name, "") database.Password = getEnvOrDefault(database.Password, "DB_PASSWORD", database.Name, "") database.Host = getEnvOrDefault(database.Host, "DB_HOST", database.Name, "") - database.Port = getEnvOrDefault(database.Port, "DB_PORT", database.Name, "5432") + database.Port = getEnvOrDefault(database.Port, "DB_PORT", database.Name, "3306") return &dbConfig{ dbHost: database.Host, dbPort: database.Port, diff --git a/utils/config.go b/utils/config.go index 090b21f..cb09ea3 100644 --- a/utils/config.go +++ b/utils/config.go @@ -83,3 +83,13 @@ func backupReference() string { const templatePath = "/config/templates" var DatabaseName = "" +var vars = []string{ + "TG_TOKEN", + "TG_CHAT_ID", +} +var mailVars = []string{ + "MAIL_HOST", + "MAIL_PORT", + "MAIL_FROM", + "MAIL_TO", +} diff --git a/utils/notification.go b/utils/notification.go index 795c4d3..35a0f54 100644 --- a/utils/notification.go +++ b/utils/notification.go @@ -107,19 +107,6 @@ func sendMessage(msg string) error { } func NotifySuccess(notificationData *NotificationData) { notificationData.BackupReference = backupReference() - var vars = []string{ - "TG_TOKEN", - "TG_CHAT_ID", - } - var mailVars = []string{ - "MAIL_HOST", - "MAIL_PORT", - "MAIL_USERNAME", - "MAIL_PASSWORD", - "MAIL_FROM", - "MAIL_TO", - } - // Email notification err := CheckEnvVars(mailVars) if err == nil { @@ -147,18 +134,6 @@ func NotifySuccess(notificationData *NotificationData) { } } func NotifyError(error string) { - var vars = []string{ - "TG_TOKEN", - "TG_CHAT_ID", - } - var mailVars = []string{ - "MAIL_HOST", - "MAIL_PORT", - "MAIL_USERNAME", - "MAIL_PASSWORD", - "MAIL_FROM", - "MAIL_TO", - } // Email notification err := CheckEnvVars(mailVars)