[-] do not produce db objects, use db.Ping() instead of sqlx.Connect()

cybertec-postgresql · Apr 12, 2020 · 8662f94 · 8662f94
1 parent e4b1d8c
commit 8662f94
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/pgengine/bootstrap.go b/internal/pgengine/bootstrap.go
@@ -128,8 +128,7 @@ func ReconnectDbAndFixLeftovers() {
 		fmt.Printf(GetLogPrefixLn("REPAIR"), fmt.Sprintf("Connection to the server was lost. Waiting for %d sec...", waitTime))
 		time.Sleep(waitTime * time.Second)
 		fmt.Printf(GetLogPrefix("REPAIR"), "Reconnecting...\n")
-		ConfigDb, err = sqlx.Connect("postgres", fmt.Sprintf("host=%s port=%s dbname=%s sslmode=%s user=%s password=%s",
-			Host, Port, DbName, SSLMode, User, Password))
+		err = ConfigDb.Ping()
 		if err == nil {
 			LogToDB("LOG", "Connection reestablished...")
 			FixSchedulerCrash()

diff --git a/internal/pgengine/log.go b/internal/pgengine/log.go
@@ -42,9 +42,10 @@ func GetLogPrefixLn(level string) string {
 	return GetLogPrefix(level) + "\n"
 }
 
+const logTemplate = `INSERT INTO timetable.log(pid, client_name, log_level, message) VALUES ($1, $2, $3, $4)`
+
 // LogToDB performs logging to configuration database ConfigDB initiated during bootstrap
 func LogToDB(level string, msg ...interface{}) {
-	const logTemplate = `INSERT INTO timetable.log(pid, client_name, log_level, message) VALUES ($1, $2, $3, $4)`
 	if !VerboseLogLevel {
 		switch level {
 		case