From 97d1542412235aa1b7d268bf15abf585332e92bc Mon Sep 17 00:00:00 2001
From: Valentin Kuznetsov <vkuznet@gmail.com>
Date: Thu, 31 Mar 2022 14:29:55 -0400
Subject: [PATCH] Use different pointer for MigrationDB

---
 dbs/migration_requests.go |  5 +++--
 web/server.go             | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dbs/migration_requests.go b/dbs/migration_requests.go
index d2dfcb4d..f3d21e3e 100644
--- a/dbs/migration_requests.go
+++ b/dbs/migration_requests.go
@@ -157,7 +157,7 @@ func MigrationRequests(mid int64) ([]MigrationRequest, error) {
 			Error(
 				err,
 				TransactionErrorCode,
-				"",
+				"unable to obtain MigrationDB transaction",
 				"dbs.migration_requests.MigrationRequests")
 	}
 	defer tx.Rollback()
@@ -167,7 +167,8 @@ func MigrationRequests(mid int64) ([]MigrationRequest, error) {
 	}
 	rows, err := tx.Query(stm, args...)
 	if err != nil {
-		return records, Error(err, QueryErrorCode, "", "dbs.migration_requests.MigrationRequests")
+		msg := fmt.Sprintf("fail to execute %s", stm)
+		return records, Error(err, QueryErrorCode, msg, "dbs.migration_requests.MigrationRequests")
 	}
 	defer rows.Close()
 	for rows.Next() {
diff --git a/web/server.go b/web/server.go
index 2c1635f4..d594129f 100644
--- a/web/server.go
+++ b/web/server.go
@@ -44,15 +44,15 @@ import (
 	_ "net/http/pprof"
 
 	"github.com/dmwm/cmsauth"
+	"github.com/dmwm/dbs2go/dbs"
+	dbsGraphQL "github.com/dmwm/dbs2go/graphql"
+	"github.com/dmwm/dbs2go/utils"
 	validator "github.com/go-playground/validator/v10"
 	"github.com/gorilla/csrf"
 	"github.com/gorilla/mux"
 	graphql "github.com/graph-gophers/graphql-go"
 	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
 	"github.com/vkuznet/auth-proxy-server/logging"
-	"github.com/dmwm/dbs2go/dbs"
-	dbsGraphQL "github.com/dmwm/dbs2go/graphql"
-	"github.com/dmwm/dbs2go/utils"
 
 	// imports for supported DB drivers
 	// go-oci8 oracle driver
@@ -387,11 +387,12 @@ func Server(configFile string) {
 	// setup MigrationDB access
 	if Config.ServerType == "DBSMigration" || Config.ServerType == "DBSMigrate" {
 		log.Println("parse Config.MigrationDBFile:", Config.MigrationDBFile)
-		dbtype, dburi, dbowner = dbs.ParseDBFile(Config.MigrationDBFile)
-		db, dberr = dbInit(dbtype, dburi)
+		dbtype, dburi, dbowner := dbs.ParseDBFile(Config.MigrationDBFile)
+		db, dberr := dbInit(dbtype, dburi)
 		if dberr != nil {
 			log.Fatal(dberr)
 		}
+		log.Printf("obtain MigrationDB dburi for %s and %s", dbtype, dbowner)
 		dbs.MigrationDB = db
 		defer dbs.MigrationDB.Close()
 	}