From 6f4f148d3bf8601223eee9d0cae72afa832baf8b Mon Sep 17 00:00:00 2001
From: Madhu Rajanna <mrajanna@redhat.com>
Date: Tue, 19 Feb 2019 19:19:40 +0530
Subject: [PATCH] remove glog

Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
---
 cmd/cephfs/main.go | 10 +++++++++-
 cmd/rbd/main.go    | 10 +++++++++-
 pkg/util/log.go    | 45 ---------------------------------------------
 3 files changed, 18 insertions(+), 47 deletions(-)
 delete mode 100644 pkg/util/log.go

diff --git a/cmd/cephfs/main.go b/cmd/cephfs/main.go
index 719887763..8ee9141e6 100644
--- a/cmd/cephfs/main.go
+++ b/cmd/cephfs/main.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/ceph/ceph-csi/pkg/cephfs"
 	"github.com/ceph/ceph-csi/pkg/util"
+	"k8s.io/klog"
 )
 
 var (
@@ -32,8 +33,15 @@ var (
 	metadataStorage = flag.String("metadatastorage", "", "metadata persistence method [node|k8s_configmap]")
 )
 
+func init() {
+	klog.InitFlags(nil)
+	if err := flag.Set("logtostderr", "true"); err != nil {
+		klog.Exitf("failed to set logtostderr flag: %v", err)
+	}
+	flag.Parse()
+}
+
 func main() {
-	util.InitLogging()
 
 	cp, err := util.CreatePersistanceStorage(cephfs.PluginFolder, *metadataStorage, *driverName)
 	if err != nil {
diff --git a/cmd/rbd/main.go b/cmd/rbd/main.go
index 6aec53ea7..6f61c637f 100644
--- a/cmd/rbd/main.go
+++ b/cmd/rbd/main.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/ceph/ceph-csi/pkg/rbd"
 	"github.com/ceph/ceph-csi/pkg/util"
+	"k8s.io/klog"
 )
 
 var (
@@ -32,8 +33,15 @@ var (
 	metadataStorage = flag.String("metadatastorage", "", "metadata persistence method [node|k8s_configmap]")
 )
 
+func init() {
+	klog.InitFlags(nil)
+	if err := flag.Set("logtostderr", "true"); err != nil {
+		klog.Exitf("failed to set logtostderr flag: %v", err)
+	}
+	flag.Parse()
+}
+
 func main() {
-	util.InitLogging()
 
 	cp, err := util.CreatePersistanceStorage(rbd.PluginFolder, *metadataStorage, *driverName)
 	if err != nil {
diff --git a/pkg/util/log.go b/pkg/util/log.go
deleted file mode 100644
index 3d500aaeb..000000000
--- a/pkg/util/log.go
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package util
-
-import (
-	"flag"
-	"os"
-
-	"k8s.io/klog"
-)
-
-// InitLogging initializes klog alongside glog
-// XXX: This is just a temporary solution till all deps move to klog
-func InitLogging() {
-	if err := flag.Set("logtostderr", "true"); err != nil {
-		klog.Errorf("failed to set logtostderr flag: %v", err)
-		os.Exit(1)
-	}
-
-	flag.Parse()
-
-	klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
-	klog.InitFlags(klogFlags)
-
-	// Sync klog flags with glog
-	flag.CommandLine.VisitAll(func(f1 *flag.Flag) {
-		if f2 := klogFlags.Lookup(f1.Name); f2 != nil {
-			f2.Value.Set(f1.Value.String()) // nolint: errcheck, gosec
-		}
-	})
-}