mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 02:50:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved klog initialization into pkg/util package

Browse Source
This commit is contained in:
gman 2019-02-12 16:31:55 +01:00
parent 1748629de2
commit 6099f142f0
3 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/cephfs/main.go
View File

@ -35,26 +35,7 @@ var (
) )
func main() { func main() {
if err := flag.Set("logtostderr", "true"); err != nil { util.InitLogging()
klog.Errorf("failed to set logtostderr flag: %v", err)
os.Exit(1)
}
flag.Parse()
// TODO: remove this once github.com/kubernetes-csi/drivers/pkg/csi-common pkg moves to klog
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 {
if err := f2.Value.Set(f1.Value.String()); err != nil {
klog.Errorf("failed to set %s flag: %v", f1.Name, err)
os.Exit(1)
}
}
})
if err := createPersistentStorage(path.Join(cephfs.PluginFolder, "controller")); err != nil { if err := createPersistentStorage(path.Join(cephfs.PluginFolder, "controller")); err != nil {
klog.Errorf("failed to create persistent storage for controller: %v", err) klog.Errorf("failed to create persistent storage for controller: %v", err)

21
cmd/rbd/main.go
View File

@ -35,26 +35,7 @@ var (
) )
func main() { func main() {
if err := flag.Set("logtostderr", "true"); err != nil { util.InitLogging()
klog.Errorf("failed to set logtostderr flag: %v", err)
os.Exit(1)
}
flag.Parse()
// TODO: remove this once github.com/kubernetes-csi/drivers/pkg/csi-common pkg moves to klog
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 {
if err := f2.Value.Set(f1.Value.String()); err != nil {
klog.Errorf("failed to set %s flag: %v", f1.Name, err)
os.Exit(1)
}
}
})
if err := createPersistentStorage(path.Join(rbd.PluginFolder, "controller")); err != nil { if err := createPersistentStorage(path.Join(rbd.PluginFolder, "controller")); err != nil {
klog.Errorf("failed to create persistent storage for controller %v", err) klog.Errorf("failed to create persistent storage for controller %v", err)

45
pkg/util/log.go Normal file
View File

@ -0,0 +1,45 @@
/*
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
}
})
}