From 8fe3ac9b331c18a74572590a623abf7d287650f7 Mon Sep 17 00:00:00 2001
From: "A.Unger" <zyxancf@gmail.com>
Date: Fri, 9 Oct 2020 11:24:04 +0200
Subject: [PATCH] wip correctly parse config

---
 proxy/pkg/command/root.go    | 11 ++++++-----
 proxy/pkg/command/server.go  |  3 ---
 proxy/pkg/flagset/flagset.go | 14 +++++++-------
 proxy/pkg/proxy/proxy.go     |  4 ++--
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/proxy/pkg/command/root.go b/proxy/pkg/command/root.go
index 5585b33bf..bc5265d0c 100644
--- a/proxy/pkg/command/root.go
+++ b/proxy/pkg/command/root.go
@@ -33,7 +33,8 @@ func Execute() error {
 
 		Before: func(c *cli.Context) error {
 			cfg.Service.Version = version.String
-			return ParseConfig(c, cfg)
+			return nil
+			//return ParseConfig(c, cfg)
 		},
 
 		Commands: []*cli.Command{
@@ -87,16 +88,16 @@ func ParseConfig(c *cli.Context, cfg *config.Config) error {
 	if err := viper.ReadInConfig(); err != nil {
 		switch err.(type) {
 		case viper.ConfigFileNotFoundError:
-			logger.Info().
-				Msg("Continue without config")
+			logger.Debug().
+				Msg("no config found on preconfigured location")
 		case viper.UnsupportedConfigError:
 			logger.Fatal().
 				Err(err).
-				Msg("Unsupported config type")
+				Msg("unsupported config type")
 		default:
 			logger.Fatal().
 				Err(err).
-				Msg("Failed to read config")
+				Msg("failed to read config")
 		}
 	}
 
diff --git a/proxy/pkg/command/server.go b/proxy/pkg/command/server.go
index d6c2892f7..7acf2b756 100644
--- a/proxy/pkg/command/server.go
+++ b/proxy/pkg/command/server.go
@@ -6,7 +6,6 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
-	"strconv"
 	"strings"
 	"time"
 
@@ -45,8 +44,6 @@ func Server(cfg *config.Config) *cli.Command {
 		Usage: "Start integrated server",
 		Flags: flagset.ServerWithConfig(cfg),
 		Before: func(ctx *cli.Context) error {
-			l := NewLogger(cfg)
-			l.Debug().Str("tracing", strconv.FormatBool(cfg.Tracing.Enabled)).Msg("init: before")
 			if cfg.HTTP.Root != "/" {
 				cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
 			}
diff --git a/proxy/pkg/flagset/flagset.go b/proxy/pkg/flagset/flagset.go
index 1ccc497d6..9b84e8a6d 100644
--- a/proxy/pkg/flagset/flagset.go
+++ b/proxy/pkg/flagset/flagset.go
@@ -8,13 +8,6 @@ import (
 // RootWithConfig applies cfg to the root flagset
 func RootWithConfig(cfg *config.Config) []cli.Flag {
 	return []cli.Flag{
-		&cli.StringFlag{
-			Name:        "config-file",
-			Value:       "",
-			Usage:       "Path to config file",
-			EnvVars:     []string{"PROXY_CONFIG_FILE"},
-			Destination: &cfg.File,
-		},
 		&cli.StringFlag{
 			Name:        "log-level",
 			Value:       "info",
@@ -55,6 +48,13 @@ func HealthWithConfig(cfg *config.Config) []cli.Flag {
 // ServerWithConfig applies cfg to the root flagset
 func ServerWithConfig(cfg *config.Config) []cli.Flag {
 	return []cli.Flag{
+		&cli.StringFlag{
+			Name:        "config-file",
+			Value:       "",
+			Usage:       "Path to config file",
+			EnvVars:     []string{"PROXY_CONFIG_FILE"},
+			Destination: &cfg.File,
+		},
 		&cli.BoolFlag{
 			Name:        "tracing-enabled",
 			Usage:       "Enable sending traces",
diff --git a/proxy/pkg/proxy/proxy.go b/proxy/pkg/proxy/proxy.go
index 7e87bc21f..b94962d8f 100644
--- a/proxy/pkg/proxy/proxy.go
+++ b/proxy/pkg/proxy/proxy.go
@@ -26,7 +26,7 @@ type MultiHostReverseProxy struct {
 	config         *config.Config
 }
 
-// NewMultiHostReverseProxy undocummented
+// NewMultiHostReverseProxy creates a new MultiHostReverseProxy
 func NewMultiHostReverseProxy(opts ...Option) *MultiHostReverseProxy {
 	options := newOptions(opts...)
 
@@ -41,7 +41,7 @@ func NewMultiHostReverseProxy(opts ...Option) *MultiHostReverseProxy {
 		rp.logger.Info().Str("source", "runtime").Msg("Policies")
 		options.Config.Policies = defaultPolicies()
 	} else {
-		rp.logger.Info().Str("source", "file").Msg("Policies")
+		rp.logger.Info().Str("source", "file").Str("src", options.Config.File).Msg("policies")
 	}
 
 	if options.Config.PolicySelector == nil {