From 69819d334a3e14163f44eef0bc662599374ba911 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 11 Jun 2015 08:52:55 -0700 Subject: [PATCH] pkg/flags: use leveled log --- pkg/flags/flag.go | 10 +++++++--- pkg/flags/urls.go | 3 +-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/flags/flag.go b/pkg/flags/flag.go index 3a281a262..ff368ef4f 100644 --- a/pkg/flags/flag.go +++ b/pkg/flags/flag.go @@ -17,12 +17,16 @@ package flags import ( "flag" "fmt" - "log" "net/url" "os" "strings" "github.com/coreos/etcd/pkg/transport" + "github.com/coreos/pkg/capnslog" +) + +var ( + plog = capnslog.NewPackageLogger("github.com/coreos/etcd/pkg", "flags") ) // DeprecatedFlag encapsulates a flag that may have been previously valid but @@ -52,7 +56,7 @@ func (f *IgnoredFlag) IsBoolFlag() bool { } func (f *IgnoredFlag) Set(s string) error { - log.Printf(`WARNING: flag "-%s" is no longer supported - ignoring.`, f.Name) + plog.Warningf(`flag "-%s" is no longer supported - ignoring.`, f.Name) return nil } @@ -96,7 +100,7 @@ func SetBindAddrFromAddr(fs *flag.FlagSet, bindAddrFlagName, addrFlagName string addr := *fs.Lookup(addrFlagName).Value.(*IPAddressPort) addr.IP = "::" if err := fs.Set(bindAddrFlagName, addr.String()); err != nil { - log.Panicf("etcdmain: unexpected flags set error: %v", err) + plog.Panicf("unexpected flags set error: %v", err) } } diff --git a/pkg/flags/urls.go b/pkg/flags/urls.go index cf8214553..6d28129d7 100644 --- a/pkg/flags/urls.go +++ b/pkg/flags/urls.go @@ -15,7 +15,6 @@ package flags import ( - "log" "strings" "github.com/coreos/etcd/pkg/types" @@ -47,7 +46,7 @@ func (us *URLsValue) String() string { func NewURLsValue(init string) *URLsValue { v := &URLsValue{} if err := v.Set(init); err != nil { - log.Panicf("new URLsValue should never fail: %v", err) + plog.Panicf("new URLsValue should never fail: %v", err) } return v }