Ver código fonte

pkg/flags: use leveled log

Xiang Li 10 anos atrás
pai
commit
69819d334a
2 arquivos alterados com 8 adições e 5 exclusões
  1. 7 3
      pkg/flags/flag.go
  2. 1 2
      pkg/flags/urls.go

+ 7 - 3
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)
 	}
 }
 

+ 1 - 2
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
 }