From b02718f86b695a84ce7496e9c735072377560eae Mon Sep 17 00:00:00 2001 From: Areg Harutyunyan Date: Fri, 8 Mar 2019 02:36:24 -0600 Subject: [PATCH] TUN-1389: Non-scalar flags in a cloudflared config.yml don't get logged --- cmd/cloudflared/tunnel/configuration.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cmd/cloudflared/tunnel/configuration.go b/cmd/cloudflared/tunnel/configuration.go index 33f0dec6..c339964c 100644 --- a/cmd/cloudflared/tunnel/configuration.go +++ b/cmd/cloudflared/tunnel/configuration.go @@ -70,8 +70,16 @@ func logClientOptions(c *cli.Context) { for _, flag := range c.LocalFlagNames() { flags[flag] = c.Generic(flag) } + + sliceFlags := []string{"header", "tag", "proxy-dns-upstream", "upstream", "edge"} + for _, sliceFlag := range sliceFlags { + if len(c.StringSlice(sliceFlag)) > 0 { + flags[sliceFlag] = strings.Join(c.StringSlice(sliceFlag), ", ") + } + } + if len(flags) > 0 { - logger.Infof("Flags %v", flags) + logger.WithFields(flags).Info("Flags") } envs := make(map[string]string)