Skip to content

Commit e223b06

Browse files
authored
Fix connection bug (#136)
1 parent b78ee3e commit e223b06

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

internal/flypg/node.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ func (n *Node) PostInit(ctx context.Context) error {
276276
case StandbyRoleName:
277277
// Register existing standby to take-on any configuration changes.
278278
if err := n.RepMgr.registerStandby(); err != nil {
279-
fmt.Printf("failed to register standby: %s\n", err)
279+
fmt.Printf("failed to register existing standby: %s\n", err)
280280
}
281281
default:
282282
return fmt.Errorf("member has unknown role: %q", member.Role)
@@ -342,7 +342,7 @@ func (n *Node) PostInit(ctx context.Context) error {
342342
// Configure as standby
343343
fmt.Println("Registering standby")
344344
if err := n.RepMgr.registerStandby(); err != nil {
345-
fmt.Printf("failed to register standby: %s\n", err)
345+
fmt.Printf("failed to register new standby: %s\n", err)
346346
}
347347

348348
// Let the boot process know that we've already been configured.

internal/flypg/registration.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func isRegistered(ctx context.Context, conn *pgx.Conn, n *Node) (bool, error) {
2121
// Below is for backwards compatibility
2222
databases, err := admin.ListDatabases(ctx, conn)
2323
if err != nil {
24-
return false, err
24+
return false, fmt.Errorf("failed to list databases: %s", err)
2525
}
2626

2727
repmgrExists := false
@@ -38,11 +38,11 @@ func isRegistered(ctx context.Context, conn *pgx.Conn, n *Node) (bool, error) {
3838

3939
repConn, err := n.RepMgr.NewLocalConnection(ctx)
4040
if err != nil {
41-
return false, err
41+
return false, fmt.Errorf("failed to connect to local repmgr: %s", err)
4242
}
4343
defer func() { _ = repConn.Close(ctx) }()
4444

45-
member, err := n.RepMgr.Member(ctx, conn)
45+
member, err := n.RepMgr.Member(ctx, repConn)
4646
if err != nil {
4747
if errors.Is(err, pgx.ErrNoRows) {
4848
return false, nil

0 commit comments

Comments
 (0)