diff --git a/proxy/pkg/command/proxy_example_config.yaml b/proxy/pkg/command/proxy_example_config.yaml index 4cfb08b5d..0c2bff022 100644 --- a/proxy/pkg/command/proxy_example_config.yaml +++ b/proxy/pkg/command/proxy_example_config.yaml @@ -1,6 +1,6 @@ -#log: -# level: debug -# color: false -# pretty: false +log: + level: info + color: true + pretty: true http: addr: "${PROXY_HTTP_ADDR|localhost:2222}" diff --git a/proxy/pkg/command/server.go b/proxy/pkg/command/server.go index 6a1465767..521d2f07d 100644 --- a/proxy/pkg/command/server.go +++ b/proxy/pkg/command/server.go @@ -39,14 +39,15 @@ func Server(cfg *config.Config) *cli.Command { return &cli.Command{ Name: "server", Usage: "Start integrated server", - //Flags: append(flagset.ServerWithConfig(cfg), flagset.RootWithConfig(cfg)...), Before: func(ctx *cli.Context) error { - logger := NewLogger(cfg) + if err := ParseConfig(ctx, cfg); err != nil { + return err + } + if cfg.HTTP.Root != "/" { cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/") } - // StringSliceFlag doesn't support Destination - // UPDATE Destination on string flags supported. Wait for https://github.com/urfave/cli/pull/1078 to get to micro/cli + if len(ctx.StringSlice("presignedurl-allow-method")) > 0 { cfg.PreSignedURL.AllowedHTTPMethods = ctx.StringSlice("presignedurl-allow-method") } @@ -55,13 +56,6 @@ func Server(cfg *config.Config) *cli.Command { return err } - if err := ParseConfig(ctx, cfg); err != nil { - panic(err) - } - //if !cfg.Supervised { - // return ParseConfig(ctx, cfg) - //} - logger.Debug().Str("service", "ocs").Msg("ignoring config file parsing when running supervised") return nil }, Action: func(c *cli.Context) error { diff --git a/proxy/pkg/proxy/proxy.go b/proxy/pkg/proxy/proxy.go index a863fd5e9..465c1563c 100644 --- a/proxy/pkg/proxy/proxy.go +++ b/proxy/pkg/proxy/proxy.go @@ -93,20 +93,15 @@ func NewMultiHostReverseProxy(opts ...Option) *MultiHostReverseProxy { for _, pol := range options.Config.Policies { for _, route := range pol.Routes { rp.logger.Debug().Str("fwd: ", route.Endpoint) - uri, err := url.Parse(route.Backend) - if err != nil { + uri, err2 := url.Parse(route.Backend) + if err2 != nil { rp.logger. Fatal(). // fail early on misconfiguration - Err(err). + Err(err2). Str("backend", route.Backend). Msg("malformed url") } - rp.logger. - Debug(). - Interface("route", route). - Msg("adding route") - rp.AddHost(pol.Name, uri, route) } }