Merge pull request #9 from fly-apps/separate-out-repmgr

Separate out repmgr

Author: davissp14

cmd/event_handler/main.go

@@ -28,45 +28,45 @@ func main() {
 	switch *event {
 	case "repmgrd_failover_promote", "standby_promote":
 		// TODO - Need to figure out what to do when success == 0.
-		client, err := state.NewConsulClient()
+		consul, err := state.NewConsulClient()
 		if err != nil {
 			fmt.Printf("failed to initialize consul client: %s", err)
 		}
 
-		node, err := client.Node(int32(*nodeID))
+		node, err := consul.Node(int32(*nodeID))
 		if err != nil {
 			fmt.Printf("failed to find node: %s", err)
 		}
 
-		if err := client.RegisterPrimary(string(node.Value)); err != nil {
-			fmt.Printf("failed to register primary: %s", err)
+		if err := consul.RegisterPrimary(string(node.Value)); err != nil {
+			fmt.Printf("failed to register primary with consul: %s", err)
 		}
 
 		flypgNode, err := flypg.NewNode()
 		if err != nil {
-			fmt.Printf("failed to reconfigure pgbouncer primary %s\n", err)
+			fmt.Printf("failed to reference node: %s\n", err)
 		}
 
 		fmt.Println("Reconfiguring pgbouncer primary")
 		if err := flypgNode.PGBouncer.ConfigurePrimary(string(node.Value), true); err != nil {
 			fmt.Printf("failed to reconfigure pgbouncer primary %s\n", err)
 		}
 	case "standby_follow":
-		client, err := state.NewConsulClient()
+		consul, err := state.NewConsulClient()
 		if err != nil {
 			fmt.Printf("failed to initialize consul client: %s", err)
 		}
 		newNodeID, err := strconv.Atoi(*newPrimary)
 		if err != nil {
 			fmt.Printf("failed to parse new node id: %s", err)
 		}
-		node, err := client.Node(int32(newNodeID))
+		node, err := consul.Node(int32(newNodeID))
 		if err != nil {
-			fmt.Printf("failed to find node: %s", err)
+			fmt.Printf("failed to find node in consul: %s", err)
 		}
 		flypgNode, err := flypg.NewNode()
 		if err != nil {
-			fmt.Printf("failed to reconfigure pgbouncer primary %s\n", err)
+			fmt.Printf("failed to reference node: %s\n", err)
 		}
 		fmt.Println("Reconfiguring pgbouncer primary")
 		if err := flypgNode.PGBouncer.ConfigurePrimary(string(node.Value), true); err != nil {

cmd/start/main.go

@@ -46,7 +46,7 @@ func main() {
 	svisor.AddProcess("pgbouncer", fmt.Sprintf("pgbouncer %s/pgbouncer.ini", node.PGBouncer.ConfigPath),
 		supervisor.WithRestart(0, 1*time.Second),
 	)
-	svisor.AddProcess("repmgrd", fmt.Sprintf("gosu postgres repmgrd -f %s --daemonize=false", node.ManagerConfigPath),
+	svisor.AddProcess("repmgrd", fmt.Sprintf("gosu postgres repmgrd -f %s --daemonize=false", node.RepMgr.ConfigPath),
 		supervisor.WithRestart(0, 5*time.Second),
 	)
 

pkg/flypg/admin/admin.go

@@ -76,7 +76,7 @@ func ResolveRole(ctx context.Context, pg *pgx.Conn) (string, error) {
 }
 
 func EnableExtension(pg *pgx.Conn, extension string) error {
-	sql := fmt.Sprintf("CREATE EXTENSION %s;", extension)
+	sql := fmt.Sprintf("CREATE EXTENSION IF NOT EXISTS %s;", extension)
 	_, err := pg.Exec(context.Background(), sql)
 	return err
 }