Return wrapped errors in mysql and postgres database Connect methods (w…

…arrant-dev#58)
difftim · Apr 5, 2023 · 8f83cc2 · 8f83cc2
1 parent dcb474f
commit 8f83cc2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/database/mysql.go b/pkg/database/mysql.go
@@ -41,12 +41,12 @@ func (ds *MySQL) Connect(ctx context.Context) error {
 
 	db, err = sqlx.Open("mysql", fmt.Sprintf("%s:%s@tcp(%s:3306)/?parseTime=true", ds.Config.Username, ds.Config.Password, ds.Config.Hostname))
 	if err != nil {
-		errors.Wrap(err, "Unable to establish connection to mysql. Shutting down server.")
+		return errors.Wrap(err, "Unable to establish connection to mysql. Shutting down server.")
 	}
 
 	err = db.PingContext(ctx)
 	if err != nil {
-		errors.Wrap(err, "Unable to ping mysql. Shutting down server.")
+		return errors.Wrap(err, "Unable to ping mysql. Shutting down server.")
 	}
 
 	if ds.Config.MaxIdleConnections != 0 {

diff --git a/pkg/database/postgres.go b/pkg/database/postgres.go
@@ -41,7 +41,7 @@ func (ds *Postgres) Connect(ctx context.Context) error {
 
 	db, err = sqlx.Open("postgres", fmt.Sprintf("postgres://%s:%s@%s/?sslmode=%s", ds.Config.Username, ds.Config.Password, ds.Config.Hostname, ds.Config.SSLMode))
 	if err != nil {
-		errors.Wrap(err, fmt.Sprintf("Unable to establish connection to postgres database %s. Shutting down server.", ds.Config.Database))
+		return errors.Wrap(err, fmt.Sprintf("Unable to establish connection to postgres database %s. Shutting down server.", ds.Config.Database))
 	}
 
 	// create database if it does not already exist
@@ -56,12 +56,12 @@ func (ds *Postgres) Connect(ctx context.Context) error {
 	db.Close()
 	db, err = sqlx.Open("postgres", fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s", ds.Config.Username, ds.Config.Password, ds.Config.Hostname, ds.Config.Database, ds.Config.SSLMode))
 	if err != nil {
-		errors.Wrap(err, fmt.Sprintf("Unable to establish connection to postgres database %s. Shutting down server.", ds.Config.Database))
+		return errors.Wrap(err, fmt.Sprintf("Unable to establish connection to postgres database %s. Shutting down server.", ds.Config.Database))
 	}
 
 	err = db.PingContext(ctx)
 	if err != nil {
-		errors.Wrap(err, fmt.Sprintf("Unable to ping postgres database %s. Shutting down server.", ds.Config.Database))
+		return errors.Wrap(err, fmt.Sprintf("Unable to ping postgres database %s. Shutting down server.", ds.Config.Database))
 	}
 
 	if ds.Config.MaxIdleConnections != 0 {