Merge pull request #6551 from xiang90/fix_log_repo

pkg: use etcd as logging repo

pkg/fileutil/fileutil.go

@@ -33,7 +33,7 @@ const (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/pkg", "fileutil")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/fileutil")
 )
 
 // IsDirWriteable checks if dir is writable by writing and removing a file

pkg/flags/flag.go

@@ -27,7 +27,7 @@ import (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/pkg", "flags")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/flags")
 )
 
 // DeprecatedFlag encapsulates a flag that may have been previously valid but

pkg/logutil/merge_logger_test.go

@@ -24,7 +24,7 @@ import (
 )
 
 var (
-	testLogger = capnslog.NewPackageLogger("github.com/coreos/etcd/pkg", "logutil")
+	testLogger = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/logutil")
 )
 
 func TestMergeLogger(t *testing.T) {

pkg/netutil/netutil.go

@@ -26,7 +26,7 @@ import (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/pkg", "netutil")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/netutil")
 
 	// indirection for testing
 	resolveTCPAddr = net.ResolveTCPAddr

pkg/osutil/osutil.go

@@ -23,7 +23,7 @@ import (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/pkg", "osutil")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/osutil")
 )
 
 func Unsetenv(key string) error {

pkg/pbutil/pbutil.go

@@ -18,7 +18,7 @@ package pbutil
 import "github.com/coreos/pkg/capnslog"
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/pkg", "pbutil")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/pbutil")
 )
 
 type Marshaler interface {