Config.

diff --git a/app.toml.dist b/app.toml.dist
new file mode 100644 (file)
index 0000000..119ac7f
--- /dev/null
+++ b/app.toml.dist
@@ -0,0 +1,9 @@
+[Proxy]
+Port=9081
+Headers=[{Name="First", Value="One"}, {Name="Second", Value="Val"}]
+
+[Service]
+Address="localhost"
+Port=9090
+Path="/some/app/path"
+Executable="executable_file_name"

diff --git a/go.mod b/go.mod
index 01ef2b4ff3f8f08c56e4f6dad84c2ad0db789e20..9b58b14271d9940a4ff2f67e7f27cc2dda738827 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,5 @@
 module example.com/devrevproxy
 
 go 1.15
+
+require github.com/spf13/viper v1.11.0

diff --git a/main.go b/main.go
index bbeeac42f7c2e10745ed3b7b906267c0b1fb2a39..dd2132ab3c729cdf0345d9c76eb7da8e6c63912a 100644 (file)
--- a/main.go
+++ b/main.go
@@ -12,11 +12,36 @@ import (
        "os/exec"
        "time"
        "strings"
+       "flag"
+
+       "github.com/spf13/viper"
 )
 
-var pid int
+type Header struct {
+       Name string
+       Value string
+}
 
-var path = "/home/tux/Documenti/sviluppo/centriestivi"
+type ConfigProxy struct {
+       Port int
+       Headers []Header
+}
+
+type ConfigService struct {
+       Address string
+       Port int
+       Path string
+       Executable string
+}
+
+type Config struct {
+       Proxy ConfigProxy `mapstructure:"Proxy"`
+       Service ConfigService `mapstructure:"Service"`
+}
+
+var config Config
+
+var pid int
 
 var watched = make(map[string]time.Time)
 
@@ -42,12 +67,15 @@ func NewProxy(targetHost string) (*httputil.ReverseProxy, error) {
 
 func modifyRequest(req *http.Request) {
        //req.Header.Set("X-Proxy", "Simple-Reverse-Proxy")
-       req.Header.Set("ZType", "be")
+       for _, h := range config.Proxy.Headers {
+               fmt.Println(h.Name, h.Value)
+               req.Header.Set(h.Name, h.Value)
+       }
        fmt.Println(req.URL)
 
        /* controllo se i file *.go sono cambiati */
        rebuild := false
-       dir, _ := os.Open(path)
+       dir, _ := os.Open(config.Service.Path)
        dirEntries, _ := dir.ReadDir(0)
        for _, entry := range dirEntries {
                if !entry.IsDir() && strings.HasSuffix(entry.Name(), ".go") {
@@ -59,6 +87,7 @@ func modifyRequest(req *http.Request) {
                                break
                        } else {
                                if watched[entry.Name()].Before(info.ModTime()) {
+                                       fmt.Println("File modificato", entry.Name())
                                        watched[entry.Name()] = info.ModTime()
                                        rebuild = true
                                        break
@@ -110,9 +139,9 @@ func startApp() {
        }
 
        cmd := &exec.Cmd {
-               Dir: path,
+               Dir: config.Service.Path,
                Path: goExecPath,
-               Args: []string{goExecPath, "build", "."},
+               Args: []string{goExecPath, "build", "-o", config.Service.Executable, "."},
                Stdout: os.Stdout,
                Stderr: os.Stdout,
        }
@@ -124,9 +153,9 @@ func startApp() {
 
        fmt.Println("ESEGUO RUN")
        cmd = &exec.Cmd {
-               Dir: path,
-               Path: path + "/centriestivi",
-               Args: []string{path + "/centriestivi"},
+               Dir: config.Service.Path,
+               Path: config.Service.Path + "/" + config.Service.Executable,
+               Args: []string{config.Service.Path + "/" + config.Service.Executable},
                Stdout: os.Stdout,
                Stderr: os.Stdout,
        }
@@ -143,14 +172,14 @@ func startApp() {
        /* per adesso testo se la porta tcp è aperta */
        for {
                timeout := time.Second
-               conn, err := net.DialTimeout("tcp", net.JoinHostPort("10.101.101.103", "9083"), timeout)
+               conn, err := net.DialTimeout("tcp", net.JoinHostPort(config.Service.Address, fmt.Sprintf("%d", config.Service.Port)), timeout)
                if err != nil {
                        fmt.Println("Connecting error:", err)
                        time.Sleep(5 * time.Second)
                } else {
                        if conn != nil {
                                defer conn.Close()
-                               fmt.Println("Opened", net.JoinHostPort("10.101.101.103", "9083"))
+                               fmt.Println("Opened", net.JoinHostPort(config.Service.Address, fmt.Sprintf("%d", config.Service.Port)))
                                break
                        }
                }
@@ -158,7 +187,7 @@ func startApp() {
 }
 
 func watchedInit() {
-       dir, _ := os.Open(path)
+       dir, _ := os.Open(config.Service.Path)
        dirEntries, _ := dir.ReadDir(0)
        for _, entry := range dirEntries {
                fmt.Println(entry.Name())
@@ -170,17 +199,40 @@ func watchedInit() {
 }
 
 func main() {
+       var config_file string
+
+       flag.StringVar(&config_file, "c", "./app.toml", "Config file")
+
+       flag.Parse()
+
+       viper.SetConfigFile(config_file)
+
+       viper.AutomaticEnv()
+
+       err := viper.ReadInConfig()
+       if err != nil {
+               fmt.Printf("error %v", err)
+               return
+       }
+       err = viper.Unmarshal(&config)
+       if err != nil {
+               fmt.Printf("error %v", err)
+               return
+       }
+
        watchedInit()
 
        startApp()
 
        // initialize a reverse proxy and pass the actual backend server url here
-       proxy, err := NewProxy("http://localhost:9083")
+       proxy, err := NewProxy(fmt.Sprintf("http://%s:%d", config.Service.Address, config.Service.Port))
        if err != nil {
                panic(err)
        }
 
        // handle all requests to your server using the proxy
        http.HandleFunc("/", ProxyRequestHandler(proxy))
-       log.Fatal(http.ListenAndServe(":9080", nil))
+       log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", config.Proxy.Port), nil))
+
+       fmt.Printf("Listening and serving")
 }