Skip to content

Commit 109a3ef

Browse files
committed
Bug fixes
1 parent ed5767f commit 109a3ef

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

pkg/flypg/admin/admin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func ResolveRole(ctx context.Context, pg *pgx.Conn) (string, error) {
7676
}
7777

7878
func EnableExtension(pg *pgx.Conn, extension string) error {
79-
sql := fmt.Sprintf("CREATE EXTENSION %s;", extension)
79+
sql := fmt.Sprintf("CREATE EXTENSION IF NOT EXISTS %s;", extension)
8080
_, err := pg.Exec(context.Background(), sql)
8181
return err
8282
}

pkg/flypg/node.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func NewNode() (*Node, error) {
9191
ConfigPath: "/data/repmgr.conf",
9292
DataDir: node.DataDir,
9393
PrivateIP: node.PrivateIP,
94-
Port: 5432,
94+
Port: 5433,
9595
DatabaseName: "repmgr",
9696
Credentials: Credentials{
9797
Username: "repmgr",
@@ -112,7 +112,6 @@ func (n *Node) Init() error {
112112
return fmt.Errorf("failed to establish connection with consul: %s", err)
113113
}
114114

115-
// Check to see if there's already a registered primary.
116115
primaryIP, err := consul.CurrentPrimary()
117116
if err != nil {
118117
return fmt.Errorf("failed to query current primary: %s", err)
@@ -224,6 +223,7 @@ func (n *Node) PostInit() error {
224223
}
225224

226225
// Creates the replication manager database.
226+
fmt.Println("Perform Repmgr setup")
227227
if err := repmgr.setup(conn); err != nil {
228228
return fmt.Errorf("failed to setup repmgr: %s", err)
229229
}

pkg/flypg/repmgr.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func (r *RepMgr) writeManagerConf() error {
109109
}
110110

111111
func (r *RepMgr) registerPrimary() error {
112-
cmdStr := fmt.Sprintf("repmgr -f %s primary register -F", r.ConfigPath)
112+
cmdStr := fmt.Sprintf("repmgr -f %s primary register -F -v", r.ConfigPath)
113113
if err := runCommand(cmdStr); err != nil {
114114
return err
115115
}

0 commit comments

Comments
 (0)