Refactoring. Move fpm config parser to pkg

Author: asp24

fpmConfig/fpmConfig.go renamed to pkg/phpfpm/config.go

@@ -1,4 +1,4 @@
-package fpmConfig
+package phpfpm
 
 import (
 	"fmt"
@@ -21,7 +21,7 @@ type Pool struct {
 	StatusPath string
 }
 
-func Parse(fpmConfigPath string) (Config, error) {
+func ParseConfig(fpmConfigPath string) (Config, error) {
 	c := Config{}
 	cfg := ini.Empty()
 	err := cfg.Append(fpmConfigPath)

fpmConfig/fpmConfig_test.go renamed to pkg/phpfpm/config_test.go

@@ -1,4 +1,4 @@
-package fpmConfig
+package phpfpm
 
 import (
 	"testing"
@@ -7,7 +7,7 @@ import (
 )
 
 func TestParse(t *testing.T) {
-	c, err := Parse("testData/php-fpm.conf")
+	c, err := ParseConfig("testData/php-fpm.conf")
 	assert.Nil(t, err)
 	assert.Equal(t, "testData/php-fpm.d/*.conf", c.Include)
 

pkg/phpfpm/prometeus.go

@@ -7,20 +7,18 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
-
-	"github.com/code-tool/docker-fpm-wrapper/fpmConfig"
 )
 
 const namespace = "phpfpm"
 
 type stat struct {
 	mu       *sync.Mutex
 	statuses []Status
-	pools    []fpmConfig.Pool
+	pools    []Pool
 }
 
 func RegisterPrometheus(fpmConfigPath string, update time.Duration) error {
-	cfg, err := fpmConfig.Parse(fpmConfigPath)
+	cfg, err := ParseConfig(fpmConfigPath)
 	if err != nil {
 		return err
 	}
@@ -99,7 +97,7 @@ type FPMPoolStatus struct {
 	slowRequests       *prometheus.GaugeVec
 }
 
-func NewFPMPoolStatus(pools []fpmConfig.Pool) *FPMPoolStatus {
+func NewFPMPoolStatus(pools []Pool) *FPMPoolStatus {
 	poolLabelNames := []string{"pool_name"}
 
 	return &FPMPoolStatus{