Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg/flags: use leveled log

Browse Source
This commit is contained in:
Xiang Li 2015-06-11 08:52:55 -07:00
parent 7bf0479e66
commit 69819d334a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/flags/flag.go
View File

@ -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)
}
}

3
pkg/flags/urls.go
View File

@ -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
}