From 30dcd26da9f0e630bc69c2ff86621e10132a5dd3 Mon Sep 17 00:00:00 2001 From: Ganesh Maharaj Mahalingam Date: Wed, 19 Sep 2018 23:11:15 -0700 Subject: [PATCH] Enable glog logging Change enables glog logging and also make default flag values configurable. Signed-off-by: Ganesh Maharaj Mahalingam --- cmd/rook/ceph/operator.go | 2 +- cmd/rook/cockroachdb/operator.go | 1 + cmd/rook/minio/operator.go | 1 + cmd/rook/nfs/operator.go | 1 + cmd/rook/rook/rook.go | 4 ---- pkg/util/flags/flags.go | 9 +++++++++ 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/cmd/rook/ceph/operator.go b/cmd/rook/ceph/operator.go index 55459f9e0..63c41dfc4 100644 --- a/cmd/rook/ceph/operator.go +++ b/cmd/rook/ceph/operator.go @@ -43,7 +43,7 @@ func init() { operatorCmd.Flags().DurationVar(&mon.HealthCheckInterval, "mon-healthcheck-interval", mon.HealthCheckInterval, "mon health check interval (duration)") operatorCmd.Flags().DurationVar(&mon.MonOutTimeout, "mon-out-timeout", mon.MonOutTimeout, "mon out timeout (duration)") flags.SetFlagsFromEnv(operatorCmd.Flags(), rook.RookEnvVarPrefix) - + flags.SetLoggingFlags(operatorCmd.Flags()) operatorCmd.RunE = startOperator } diff --git a/cmd/rook/cockroachdb/operator.go b/cmd/rook/cockroachdb/operator.go index 0af1f56cd..0f237ed3c 100644 --- a/cmd/rook/cockroachdb/operator.go +++ b/cmd/rook/cockroachdb/operator.go @@ -37,6 +37,7 @@ https://github.com/rook/rook`, func init() { flags.SetFlagsFromEnv(operatorCmd.Flags(), rook.RookEnvVarPrefix) + flags.SetLoggingFlags(operatorCmd.Flags()) operatorCmd.RunE = startOperator } diff --git a/cmd/rook/minio/operator.go b/cmd/rook/minio/operator.go index 90b75849d..613c52d62 100644 --- a/cmd/rook/minio/operator.go +++ b/cmd/rook/minio/operator.go @@ -39,6 +39,7 @@ var ( func init() { flags.SetFlagsFromEnv(operatorCmd.Flags(), rook.RookEnvVarPrefix) + flags.SetLoggingFlags(operatorCmd.Flags()) operatorCmd.RunE = startOperator } diff --git a/cmd/rook/nfs/operator.go b/cmd/rook/nfs/operator.go index d875af447..56c96fea3 100644 --- a/cmd/rook/nfs/operator.go +++ b/cmd/rook/nfs/operator.go @@ -37,6 +37,7 @@ https://github.com/rook/rook`, func init() { flags.SetFlagsFromEnv(operatorCmd.Flags(), rook.RookEnvVarPrefix) + flags.SetLoggingFlags(operatorCmd.Flags()) operatorCmd.RunE = startOperator } diff --git a/cmd/rook/rook/rook.go b/cmd/rook/rook/rook.go index 3835f2fa1..bff1c6940 100644 --- a/cmd/rook/rook/rook.go +++ b/cmd/rook/rook/rook.go @@ -16,7 +16,6 @@ limitations under the License. package rook import ( - "flag" "fmt" "os" "strings" @@ -76,9 +75,6 @@ func SetLogLevel() { } func LogStartupInfo(cmdFlags *pflag.FlagSet) { - // workaround a k8s logging issue: https://github.com/kubernetes/kubernetes/issues/17162 - flag.CommandLine.Parse([]string{}) - // log the version number, arguments, and all final flag values (environment variable overrides // have already been taken into account) flagValues := flags.GetFlagsAndValues(cmdFlags, "secret") diff --git a/pkg/util/flags/flags.go b/pkg/util/flags/flags.go index 7de08e2d9..ca33a393a 100644 --- a/pkg/util/flags/flags.go +++ b/pkg/util/flags/flags.go @@ -16,6 +16,7 @@ limitations under the License. package flags import ( + "flag" "fmt" "os" "regexp" @@ -81,6 +82,14 @@ func createRequiredFlagError(name string, flags []string) error { return fmt.Errorf("%s are required for %s", strings.Join(flags, ","), name) } +func SetLoggingFlags(flags *pflag.FlagSet) { + //Add commandline flags to the flagset. We will always write to stderr + //and not to a file by default + flags.AddGoFlagSet(flag.CommandLine) + flags.Set("logtostderr", "true") + flags.Parse(nil) +} + func SetFlagsFromEnv(flags *pflag.FlagSet, prefix string) error { flags.VisitAll(func(f *pflag.Flag) { envVar := prefix + "_" + strings.Replace(strings.ToUpper(f.Name), "-", "_", -1)