Cleanup

Author: davissp14

pkg/flypg/node.go

@@ -124,6 +124,12 @@ func (n *Node) Init() error {
 		fmt.Printf("Failed to initialize replmgr: %s\n", err.Error())
 	}
 
+	// Initialize PGBouncer
+	fmt.Println("Initializing PGBouncer")
+	if err := n.PGBouncer.initialize(); err != nil {
+		return err
+	}
+
 	switch primaryIP {
 	case n.PrivateIP:
 		// Noop
@@ -171,12 +177,6 @@ func (n *Node) Init() error {
 		return fmt.Errorf("failed to configure postgres %s", err)
 	}
 
-	// Initialize PGBouncer
-	fmt.Println("Configuring PGBouncer")
-	if err := n.PGBouncer.configure(primaryIP); err != nil {
-		return err
-	}
-
 	return nil
 }
 
@@ -279,9 +279,8 @@ func (n *Node) PostInit() error {
 		return fmt.Errorf("failed to query current primary: %s", err)
 	}
 
-	fmt.Println("Configuring pgbouncer primary")
-	if err := n.PGBouncer.ConfigurePrimary(primaryIP, false); err != nil {
-		return fmt.Errorf("failed to configure pgbouncer primary %s", err)
+	if err := n.PGBouncer.ConfigurePrimary(primaryIP, true); err != nil {
+		return fmt.Errorf("failed to configure pgbouncer's primary: %s", err)
 	}
 
 	return nil

pkg/flypg/pgbouncer.go

@@ -44,7 +44,7 @@ func (p *PGBouncer) ConfigurePrimary(primary string, reload bool) error {
 	return nil
 }
 
-func (p *PGBouncer) configure(primary string) error {
+func (p *PGBouncer) initialize() error {
 	cmdStr := fmt.Sprintf("mkdir -p %s", p.ConfigPath)
 	if err := runCommand(cmdStr); err != nil {
 		return err
@@ -66,10 +66,6 @@ func (p *PGBouncer) configure(primary string) error {
 		return fmt.Errorf("failed to configure pgbouncer auth. %s", err)
 	}
 
-	if err := p.ConfigurePrimary(primary, false); err != nil {
-		return fmt.Errorf("failed to configure pgbouncer primary. %s", err)
-	}
-
 	return nil
 }