need to handle errors

Author: davissp14

pkg/flypg/node.go

@@ -64,8 +64,8 @@ func NewNode() (*Node, error) {
 	}
 	node.PrivateIP = ipv6.String()
 
-	machineID := os.Getenv("FLY_ALLOC_ID")
 	// Generate a random, reconstructable signed int32
+	machineID := os.Getenv("FLY_ALLOC_ID")
 	seed := binary.LittleEndian.Uint64([]byte(machineID))
 	rand.Seed(int64(seed))
 	node.ID = rand.Int31()
@@ -119,11 +119,6 @@ func (n *Node) Init() error {
 		return fmt.Errorf("failed to query current primary: %s", err)
 	}
 
-	// Initialize PGBouncer
-	if err := n.PGBouncer.configure(primaryIP); err != nil {
-		return err
-	}
-
 	// Writes or updates the replication manager configuration.
 	if err := initializeRepmgr(*n); err != nil {
 		fmt.Printf("Failed to initialize replmgr: %s\n", err.Error())
@@ -176,9 +171,10 @@ func (n *Node) Init() error {
 		return fmt.Errorf("failed to configure postgres %s", err)
 	}
 
-	fmt.Println("Configuring pgbouncer auth")
-	if err := n.PGBouncer.configureAuth(); err != nil {
-		return fmt.Errorf("failed to configure pgbouncer auth %s", err)
+	// Initialize PGBouncer
+	fmt.Println("Configuring PGBouncer")
+	if err := n.PGBouncer.configure(primaryIP); err != nil {
+		return err
 	}
 
 	return nil

pkg/flypg/pgbouncer.go

@@ -62,8 +62,13 @@ func (p *PGBouncer) configure(primary string) error {
 		}
 	}
 
-	p.configureAuth()
-	p.ConfigurePrimary(primary, false)
+	if err := p.configureAuth(); err != nil {
+		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
 }