Skip to content

Commit cf3ea7c

Browse files
authored
Update appscode/go log wrapper (#287)
* Revendor dependencies * Pass through logger flags
1 parent 470cc31 commit cf3ea7c

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

root.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"log"
66
"strings"
77

8+
"github.com/appscode/go/log/golog"
89
v "github.com/appscode/go/version"
910
"github.com/appscode/kutil/tools/analytics"
1011
"github.com/appscode/stash/client/scheme"
@@ -20,9 +21,6 @@ const (
2021
)
2122

2223
func NewRootCmd() *cobra.Command {
23-
var (
24-
enableAnalytics = true
25-
)
2624
var rootCmd = &cobra.Command{
2725
Use: "stash",
2826
Short: `Stash by AppsCode - Backup your Kubernetes Volumes`,
@@ -32,7 +30,7 @@ func NewRootCmd() *cobra.Command {
3230
c.Flags().VisitAll(func(flag *pflag.Flag) {
3331
log.Printf("FLAG: --%s=%q", flag.Name, flag.Value)
3432
})
35-
if enableAnalytics && gaTrackingCode != "" {
33+
if util.EnableAnalytics && gaTrackingCode != "" {
3634
if client, err := ga.NewClient(gaTrackingCode); err == nil {
3735
util.AnalyticsClientID = analytics.ClientID()
3836
client.ClientID(util.AnalyticsClientID)
@@ -41,12 +39,13 @@ func NewRootCmd() *cobra.Command {
4139
}
4240
}
4341
scheme.AddToScheme(clientsetscheme.Scheme)
42+
util.LoggerOptions = golog.ParseFlags(c.Flags())
4443
},
4544
}
4645
rootCmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
4746
// ref: https://github.com/kubernetes/kubernetes/issues/17162#issuecomment-225596212
4847
flag.CommandLine.Parse([]string{})
49-
rootCmd.PersistentFlags().BoolVar(&enableAnalytics, "analytics", enableAnalytics, "Send analytical events to Google Analytics")
48+
rootCmd.PersistentFlags().BoolVar(&util.EnableAnalytics, "analytics", util.EnableAnalytics, "Send analytical events to Google Analytics")
5049

5150
rootCmd.AddCommand(v.NewCmdVersion())
5251
rootCmd.AddCommand(NewCmdRun())

0 commit comments

Comments
 (0)