fix server start race

dolthub · Oct 24, 2024 · 0a0b605 · 0a0b605
1 parent 2d50424
commit 0a0b605
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/go/cmd/dolt/commands/engine/sqlengine.go b/go/cmd/dolt/commands/engine/sqlengine.go
@@ -112,6 +112,11 @@ func NewSqlEngine(
 
 	all := dbs[:]
 
+	// this is overwritten only for server sessions
+	for _, db := range dbs {
+		db.DbData().Ddb.SetCommitHookLogger(ctx, cli.CliOut)
+	}
+
 	clusterDB := config.ClusterController.ClusterDatabase()
 	if clusterDB != nil {
 		all = append(all, clusterDB.(dsess.SqlDatabase))
@@ -207,11 +212,6 @@ func NewSqlEngine(
 		}
 	}
 
-	// this is overwritten only for server sessions
-	for _, db := range dbs {
-		db.DbData().Ddb.SetCommitHookLogger(ctx, cli.CliOut)
-	}
-
 	err = sql.SystemVariables.SetGlobal(dsess.DoltCommitOnTransactionCommit, config.DoltTransactionCommit)
 	if err != nil {
 		return nil, err