Keep things consistent

Author: davissp14

internal/api/handle_admin.go

@@ -221,25 +221,11 @@ func (s *Server) handleViewPostgresSettings(w http.ResponseWriter, r *http.Reque
 
 	defer close()
 
-	internal, err := flypg.ReadFromFile(s.node.PGConfig.InternalConfigFile())
+	all, err := s.node.PGConfig.CurrentConfig()
 	if err != nil {
 		renderErr(w, err)
 		return
 	}
-	user, err := flypg.ReadFromFile(s.node.PGConfig.UserConfigFile())
-	if err != nil {
-		renderErr(w, err)
-		return
-	}
-
-	all := map[string]interface{}{}
-
-	for k, v := range internal {
-		all[k] = v
-	}
-	for k, v := range user {
-		all[k] = v
-	}
 
 	var in []string
 
@@ -266,26 +252,12 @@ func (s *Server) handleViewPostgresSettings(w http.ResponseWriter, r *http.Reque
 }
 
 func (s *Server) handleViewBouncerSettings(w http.ResponseWriter, r *http.Request) {
-	internal, err := flypg.ReadFromFile(s.node.PGBouncer.InternalConfigFile())
-	if err != nil {
-		renderErr(w, err)
-		return
-	}
-	user, err := flypg.ReadFromFile(s.node.PGBouncer.UserConfigFile())
+	all, err := s.node.PGBouncer.CurrentConfig()
 	if err != nil {
 		renderErr(w, err)
 		return
 	}
 
-	all := map[string]interface{}{}
-
-	for k, v := range internal {
-		all[k] = v
-	}
-	for k, v := range user {
-		all[k] = v
-	}
-
 	var in []string
 
 	if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
@@ -307,26 +279,12 @@ func (s *Server) handleViewBouncerSettings(w http.ResponseWriter, r *http.Reques
 }
 
 func (s *Server) handleViewRepmgrSettings(w http.ResponseWriter, r *http.Request) {
-	internal, err := flypg.ReadFromFile(s.node.RepMgr.InternalConfigFile())
-	if err != nil {
-		renderErr(w, err)
-		return
-	}
-	user, err := flypg.ReadFromFile(s.node.RepMgr.UserConfigFile())
+	all, err := s.node.RepMgr.CurrentConfig()
 	if err != nil {
 		renderErr(w, err)
 		return
 	}
 
-	all := map[string]interface{}{}
-
-	for k, v := range internal {
-		all[k] = v
-	}
-	for k, v := range user {
-		all[k] = v
-	}
-
 	var in []string
 
 	if err := json.NewDecoder(r.Body).Decode(&in); err != nil {

internal/flypg/flypg.go

@@ -55,6 +55,28 @@ func (c *FlyPGConfig) UserConfigFile() string {
 	return c.userConfigFilePath
 }
 
+func (c *FlyPGConfig) CurrentConfig() (map[string]interface{}, error) {
+	internal, err := ReadFromFile(c.InternalConfigFile())
+	if err != nil {
+		return nil, err
+	}
+	user, err := ReadFromFile(c.UserConfigFile())
+	if err != nil {
+		return nil, err
+	}
+
+	all := map[string]interface{}{}
+
+	for k, v := range internal {
+		all[k] = v
+	}
+	for k, v := range user {
+		all[k] = v
+	}
+
+	return all, nil
+}
+
 func (c *FlyPGConfig) initialize() error {
 	c.SetDefaults()
 

internal/flypg/pg.go

@@ -55,6 +55,28 @@ func (c *PGConfig) UserConfigFile() string {
 	return c.userConfigFilePath
 }
 
+func (c *PGConfig) CurrentConfig() (map[string]interface{}, error) {
+	internal, err := ReadFromFile(c.InternalConfigFile())
+	if err != nil {
+		return nil, err
+	}
+	user, err := ReadFromFile(c.UserConfigFile())
+	if err != nil {
+		return nil, err
+	}
+
+	all := map[string]interface{}{}
+
+	for k, v := range internal {
+		all[k] = v
+	}
+	for k, v := range user {
+		all[k] = v
+	}
+
+	return all, nil
+}
+
 func NewConfig(dataDir string, port int) *PGConfig {
 	return &PGConfig{
 		dataDir:        dataDir,

internal/flypg/repmgr.go

@@ -58,6 +58,28 @@ func (r *RepMgr) SetUserConfig(configMap ConfigMap) {
 	r.userConfig = configMap
 }
 
+func (r *RepMgr) CurrentConfig() (map[string]interface{}, error) {
+	internal, err := ReadFromFile(r.InternalConfigFile())
+	if err != nil {
+		return nil, err
+	}
+	user, err := ReadFromFile(r.UserConfigFile())
+	if err != nil {
+		return nil, err
+	}
+
+	all := map[string]interface{}{}
+
+	for k, v := range internal {
+		all[k] = v
+	}
+	for k, v := range user {
+		all[k] = v
+	}
+
+	return all, nil
+}
+
 func (r *RepMgr) ConsulKey() string {
 	return "repmgr"
 }