From f131a4ce66076e201dabc94793a982424e66c885 Mon Sep 17 00:00:00 2001 From: Gladkov Alexey Date: Mon, 29 Apr 2019 15:12:40 +0200 Subject: [PATCH] Sync the glog and klog flags Signed-off-by: Gladkov Alexey --- cmd/dockerregistry/main.go | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/cmd/dockerregistry/main.go b/cmd/dockerregistry/main.go index a2219e144..27b0f2e84 100644 --- a/cmd/dockerregistry/main.go +++ b/cmd/dockerregistry/main.go @@ -11,7 +11,7 @@ import ( "time" log "github.com/sirupsen/logrus" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/klog" "github.com/openshift/library-go/pkg/serviceability" @@ -19,16 +19,32 @@ import ( "github.com/openshift/image-registry/pkg/version" ) +var klogFlags *flag.FlagSet + +func init() { + klogFlags = flag.NewFlagSet("klog", flag.ExitOnError) + klog.InitFlags(klogFlags) +} + func main() { - logs.InitLogs() - defer logs.FlushLogs() + _ = flag.Set("logtostderr", "true") + flag.Parse() + + // Sync the glog and klog flags. + flag.CommandLine.VisitAll(func(f1 *flag.Flag) { + f2 := klogFlags.Lookup(f1.Name) + if f2 != nil { + value := f1.Value.String() + _ = f2.Value.Set(value) + } + }) + defer serviceability.BehaviorOnPanic(os.Getenv("OPENSHIFT_ON_PANIC"), version.Get())() defer serviceability.Profile(os.Getenv("OPENSHIFT_PROFILE")).Stop() startProfiler() rand.Seed(time.Now().UTC().UnixNano()) runtime.GOMAXPROCS(runtime.NumCPU()) - flag.Parse() // TODO convert to flags instead of a config file? configurationPath := ""