Merge pull request #33 from kamil-holubicki/DISTMYSQL-406

kamil-holubicki · web-flow · commit bdb512831e4d · 2024-04-04T10:50:18.000+02:00
DISTMYSQL-406: Orchestrator exposes MySQLOrchestratorPassword variable
diff --git a/go/db/db.go b/go/db/db.go
@@ -131,7 +131,7 @@ func openOrchestratorMySQLGeneric() (db *sql.DB, fromCache bool, err error) {
 	if config.Config.MySQLOrchestratorUseMutualTLS {
 		uri, _ = SetupMySQLOrchestratorTLS(uri)
 	}
-	sqlUtilsLogger := SqlUtilsLogger{client_context: config.Config.MySQLOrchestratorHost + ":" + config.Config.MySQLOrchestratorHost}
+	sqlUtilsLogger := SqlUtilsLogger{client_context: config.Config.MySQLOrchestratorHost + ":" + strconv.FormatUint(uint64(config.Config.MySQLOrchestratorPort), 10)}
 	return sqlutils.GetDB(uri, sqlUtilsLogger)
 }
 
@@ -200,7 +200,7 @@ func OpenOrchestrator() (db *sql.DB, err error) {
 			}
 		}
 		dsn := getMySQLURI()
-		sqlUtilsLogger := SqlUtilsLogger{client_context: dsn}
+		sqlUtilsLogger := SqlUtilsLogger{client_context: config.Config.MySQLOrchestratorHost + ":" + strconv.FormatUint(uint64(config.Config.MySQLOrchestratorPort), 10)}
 		db, fromCache, err = sqlutils.GetDB(dsn, sqlUtilsLogger)
 		if err == nil && !fromCache {
 			log.Debugf("Connected to orchestrator backend: %v", safeMySQLURI(dsn))

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func openOrchestratorMySQLGeneric() (db *sql.DB, fromCache bool, err error) {`
`131`	`131`	`if config.Config.MySQLOrchestratorUseMutualTLS {`
`132`	`132`	`uri, _ = SetupMySQLOrchestratorTLS(uri)`
`133`	`133`	`}`
`134`		`- sqlUtilsLogger := SqlUtilsLogger{client_context: config.Config.MySQLOrchestratorHost + ":" + config.Config.MySQLOrchestratorHost}`
	`134`	`+ sqlUtilsLogger := SqlUtilsLogger{client_context: config.Config.MySQLOrchestratorHost + ":" + strconv.FormatUint(uint64(config.Config.MySQLOrchestratorPort), 10)}`
`135`	`135`	`return sqlutils.GetDB(uri, sqlUtilsLogger)`
`136`	`136`	`}`
`137`	`137`
`@@ -200,7 +200,7 @@ func OpenOrchestrator() (db *sql.DB, err error) {`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`	`dsn := getMySQLURI()`
`203`		`- sqlUtilsLogger := SqlUtilsLogger{client_context: dsn}`
	`203`	`+ sqlUtilsLogger := SqlUtilsLogger{client_context: config.Config.MySQLOrchestratorHost + ":" + strconv.FormatUint(uint64(config.Config.MySQLOrchestratorPort), 10)}`
`204`	`204`	`db, fromCache, err = sqlutils.GetDB(dsn, sqlUtilsLogger)`
`205`	`205`	`if err == nil && !fromCache {`
`206`	`206`	`log.Debugf("Connected to orchestrator backend: %v", safeMySQLURI(dsn))`