Merge branch '196-dynamic-port-with-idleness' into 'v2.0'

agneum · agneum · commit 0eaf5ba97f22 · 2020-11-11T05:08:23.000Z
fix: use an actual PostgreSQL port to check idleness of clones (#196) See merge request postgres-ai/database-lab!201
diff --git a/pkg/services/cloning/mode_base.go b/pkg/services/cloning/mode_base.go
@@ -585,9 +585,8 @@ func hasNotQueryActivity(session *resources.Session) (bool, error) {
 	return checkActiveQueryNotExists(db)
 }
 
-// TODO(akartasov): Move the function to the provision service.
 func getSocketConnStr(session *resources.Session) string {
-	return fmt.Sprintf("host=%s user=%s dbname=postgres", session.SocketHost, session.User)
+	return fmt.Sprintf("host=%s user=%s port=%d dbname=%s", session.SocketHost, session.User, session.Port, defaultDatabaseName)
 }
 
 // checkActiveQueryNotExists runs query to check a user activity.

Original file line number	Diff line number	Diff line change
`@@ -585,9 +585,8 @@ func hasNotQueryActivity(session *resources.Session) (bool, error) {`
`585`	`585`	`return checkActiveQueryNotExists(db)`
`586`	`586`	`}`
`587`	`587`
`588`		`-// TODO(akartasov): Move the function to the provision service.`
`589`	`588`	`func getSocketConnStr(session *resources.Session) string {`
`590`		`- return fmt.Sprintf("host=%s user=%s dbname=postgres", session.SocketHost, session.User)`
	`589`	`+ return fmt.Sprintf("host=%s user=%s port=%d dbname=%s", session.SocketHost, session.User, session.Port, defaultDatabaseName)`
`591`	`590`	`}`
`592`	`591`
`593`	`592`	`// checkActiveQueryNotExists runs query to check a user activity.`