diff --git a/internal/config/config.go b/internal/config/config.go index abb945a..9676922 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -2,6 +2,7 @@ package config import ( + "fmt" "log" "os" @@ -36,10 +37,10 @@ func CreateEnvFile() error { return nil } -func (L Login) LoadCredentials() Login { +func (L *Login) LoadCredentials() error { err := godotenv.Load(".env") if err != nil { - log.Fatal("Error loading .env file") + return fmt.Errorf("failed to load env file") } L.User = os.Getenv("DATABASE_USER") L.Pass = os.Getenv("DATABASE_PASSWORD") @@ -47,5 +48,5 @@ func (L Login) LoadCredentials() Login { L.Port = os.Getenv("DATABASE_PORT") L.Name = os.Getenv("DATABASE_NAME") - return L + return nil } diff --git a/internal/database/db.go b/internal/database/db.go index 4b25d39..04001fa 100644 --- a/internal/database/db.go +++ b/internal/database/db.go @@ -8,8 +8,14 @@ import ( ) func Connect() (*sql.DB, error) { - credentials := config.LoadCredentials() - dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s", credentials.User, credentials.Pass, credentials.Ip, credentials.Port, credentials.Name) + var lo config.Login + err := lo.LoadCredentials + if err != { + + print("failed to load configuration file") + + } + dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s", lo.User, lo.Pass, lo.IP, lo.Port, lo.Name) db, err := sql.Open("mysql", dsn) if err != nil {