From 69819d334a3e14163f44eef0bc662599374ba911 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 11 Jun 2015 08:52:55 -0700 Subject: [PATCH 01/11] 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 } From a45f53986ffcda08d8a7e685e3066d437a7fcb19 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 11 Jun 2015 08:59:43 -0700 Subject: [PATCH 02/11] pkg/netutil: use leveled log --- pkg/netutil/netutil.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go index 0f52cc3e8..04b764cdf 100644 --- a/pkg/netutil/netutil.go +++ b/pkg/netutil/netutil.go @@ -16,14 +16,17 @@ package netutil import ( "encoding/base64" - "log" "net" "net/http" "net/url" "strings" + + "github.com/coreos/pkg/capnslog" ) var ( + plog = capnslog.NewPackageLogger("github.com/coreos/etcd/pkg", "netutil") + // indirection for testing resolveTCPAddr = net.ResolveTCPAddr ) @@ -36,7 +39,7 @@ func ResolveTCPAddrs(urls ...[]url.URL) error { for i, u := range us { host, _, err := net.SplitHostPort(u.Host) if err != nil { - log.Printf("netutil: Could not parse url %s during tcp resolving.", u.Host) + plog.Errorf("could not parse url %s during tcp resolving", u.Host) return err } if host == "localhost" { @@ -47,10 +50,10 @@ func ResolveTCPAddrs(urls ...[]url.URL) error { } tcpAddr, err := resolveTCPAddr("tcp", u.Host) if err != nil { - log.Printf("netutil: Could not resolve host: %s", u.Host) + plog.Errorf("could not resolve host %s", u.Host) return err } - log.Printf("netutil: Resolving %s to %s", u.Host, tcpAddr.String()) + plog.Infof("resolving %s to %s", u.Host, tcpAddr.String()) us[i].Host = tcpAddr.String() } } From 865a5ffc6172006d387d7cd8fe8c0734fd009ca2 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 11 Jun 2015 09:00:54 -0700 Subject: [PATCH 03/11] pkg/osutil: use leveled log --- pkg/osutil/interrupt_unix.go | 3 +-- pkg/osutil/osutil.go | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/osutil/interrupt_unix.go b/pkg/osutil/interrupt_unix.go index 3063f6be2..217385747 100644 --- a/pkg/osutil/interrupt_unix.go +++ b/pkg/osutil/interrupt_unix.go @@ -17,7 +17,6 @@ package osutil import ( - "log" "os" "os/signal" "sync" @@ -58,7 +57,7 @@ func HandleInterrupts() { interruptExitMu.Lock() - log.Printf("received %v signal, shutting down...", sig) + plog.Noticef("received %v signal, shutting down...", sig) for _, h := range ihs { h() diff --git a/pkg/osutil/osutil.go b/pkg/osutil/osutil.go index 37b38329a..0c9f27f61 100644 --- a/pkg/osutil/osutil.go +++ b/pkg/osutil/osutil.go @@ -17,6 +17,12 @@ package osutil import ( "os" "strings" + + "github.com/coreos/pkg/capnslog" +) + +var ( + plog = capnslog.NewPackageLogger("github.com/coreos/etcd/pkg", "osutil") ) func Unsetenv(key string) error { From 4b5dbeff9bf707707d479b28deef53b9b7cb0848 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 11 Jun 2015 09:03:36 -0700 Subject: [PATCH 04/11] pkg/pbutil: use leveled log --- pkg/pbutil/pbutil.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/pbutil/pbutil.go b/pkg/pbutil/pbutil.go index 7d4169a98..64bd5cdd5 100644 --- a/pkg/pbutil/pbutil.go +++ b/pkg/pbutil/pbutil.go @@ -14,7 +14,11 @@ package pbutil -import "log" +import "github.com/coreos/pkg/capnslog" + +var ( + plog = capnslog.NewPackageLogger("github.com/coreos/etcd/pkg", "flags") +) type Marshaler interface { Marshal() (data []byte, err error) @@ -27,14 +31,14 @@ type Unmarshaler interface { func MustMarshal(m Marshaler) []byte { d, err := m.Marshal() if err != nil { - log.Panicf("marshal protobuf type should never fail: %v", err) + plog.Panicf("marshal should never fail (%v)", err) } return d } func MustUnmarshal(um Unmarshaler, data []byte) { if err := um.Unmarshal(data); err != nil { - log.Panicf("unmarshal protobuf type should never fail: %v", err) + plog.Panicf("unmarshal should never fail (%v)", err) } } From 2f795e42d055d8ee8763922ead34215b1be4f877 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 11 Jun 2015 09:18:54 -0700 Subject: [PATCH 05/11] httptypes: use leveled log --- etcdserver/etcdhttp/httptypes/errors.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/etcdserver/etcdhttp/httptypes/errors.go b/etcdserver/etcdhttp/httptypes/errors.go index 7e0d275eb..387a01729 100644 --- a/etcdserver/etcdhttp/httptypes/errors.go +++ b/etcdserver/etcdhttp/httptypes/errors.go @@ -16,8 +16,13 @@ package httptypes import ( "encoding/json" - "log" "net/http" + + "github.com/coreos/pkg/capnslog" +) + +var ( + plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver/etcdhttp", "httptypes") ) type HTTPError struct { @@ -36,7 +41,7 @@ func (e HTTPError) WriteTo(w http.ResponseWriter) { w.WriteHeader(e.Code) b, err := json.Marshal(e) if err != nil { - log.Panicf("marshal HTTPError should never fail: %v", err) + plog.Panicf("marshal HTTPError should never fail (%v)", err) } w.Write(b) } From cf7cb2b8a90cd7f17104f66f1a5826a140bed1a1 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 11 Jun 2015 09:30:31 -0700 Subject: [PATCH 06/11] etcdserver/security: use leveled log --- etcdserver/security/security.go | 38 +++++++++++++----------- etcdserver/security/security_requests.go | 7 ++--- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/etcdserver/security/security.go b/etcdserver/security/security.go index c6d487dde..15d834a20 100644 --- a/etcdserver/security/security.go +++ b/etcdserver/security/security.go @@ -17,7 +17,6 @@ package security import ( "encoding/json" "fmt" - "log" "path" "reflect" "sort" @@ -30,6 +29,7 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/pkg/types" + "github.com/coreos/pkg/capnslog" ) const ( @@ -43,6 +43,10 @@ const ( GuestRoleName = "guest" ) +var ( + plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver", "security") +) + var rootRole = Role{ Role: RootRoleName, Permissions: Permissions{ @@ -186,7 +190,7 @@ func (s *Store) CreateOrUpdateUser(user User) (out User, created bool, err error func (s *Store) CreateUser(user User) (User, error) { u, err := s.createUserInternal(user) if err == nil { - log.Printf("security: created user %s", user.User) + plog.Noticef("created user %s", user.User) } return u, err } @@ -225,7 +229,7 @@ func (s *Store) DeleteUser(name string) error { } return err } - log.Printf("security: deleted user %s", name) + plog.Noticef("deleted user %s", name) return nil } @@ -251,7 +255,7 @@ func (s *Store) UpdateUser(user User) (User, error) { } _, err = s.updateResource("/users/"+user.User, newUser) if err == nil { - log.Printf("security: updated user %s", user.User) + plog.Noticef("updated user %s", user.User) } return newUser, err } @@ -320,7 +324,7 @@ func (s *Store) CreateRole(role Role) error { } } if err == nil { - log.Printf("security: created new role %s", role.Role) + plog.Noticef("created new role %s", role.Role) } return err } @@ -338,7 +342,7 @@ func (s *Store) DeleteRole(name string) error { } } if err == nil { - log.Printf("security: deleted role %s", name) + plog.Noticef("deleted role %s", name) } return err } @@ -365,7 +369,7 @@ func (s *Store) UpdateRole(role Role) (Role, error) { } _, err = s.updateResource("/roles/"+role.Role, newRole) if err == nil { - log.Printf("security: updated role %s", role.Role) + plog.Noticef("updated role %s", role.Role) } return newRole, err } @@ -384,18 +388,18 @@ func (s *Store) EnableSecurity() error { } _, err = s.GetRole(GuestRoleName) if err != nil { - log.Printf("security: no guest role access found, creating default") + plog.Printf("no guest role access found, creating default") err := s.CreateRole(guestRole) if err != nil { - log.Printf("security: error creating guest role. aborting security enable.") + plog.Errorf("error creating guest role. aborting security enable.") return err } } err = s.enableSecurity() if err == nil { - log.Printf("security: enabled security") + plog.Noticef("security: enabled security") } else { - log.Printf("error enabling security: %v", err) + plog.Errorf("error enabling security (%v)", err) } return err } @@ -406,9 +410,9 @@ func (s *Store) DisableSecurity() error { } err := s.disableSecurity() if err == nil { - log.Printf("security: disabled security") + plog.Noticef("security: disabled security") } else { - log.Printf("error disabling security: %v", err) + plog.Errorf("error disabling security (%v)", err) } return err } @@ -435,14 +439,14 @@ func (u User) Merge(n User) (User, error) { currentRoles := types.NewUnsafeSet(u.Roles...) for _, g := range n.Grant { if currentRoles.Contains(g) { - log.Printf("Granting duplicate role %s for user %s", g, n.User) + plog.Noticef("granting duplicate role %s for user %s", g, n.User) continue } currentRoles.Add(g) } for _, r := range n.Revoke { if !currentRoles.Contains(r) { - log.Printf("Revoking ungranted role %s for user %s", r, n.User) + plog.Noticef("revoking ungranted role %s for user %s", r, n.User) continue } currentRoles.Remove(r) @@ -544,7 +548,7 @@ func (rw rwPermission) Revoke(n rwPermission) (rwPermission, error) { currentRead := types.NewUnsafeSet(rw.Read...) for _, r := range n.Read { if !currentRead.Contains(r) { - log.Printf("Revoking ungranted read permission %s", r) + plog.Noticef("revoking ungranted read permission %s", r) continue } currentRead.Remove(r) @@ -552,7 +556,7 @@ func (rw rwPermission) Revoke(n rwPermission) (rwPermission, error) { currentWrite := types.NewUnsafeSet(rw.Write...) for _, w := range n.Write { if !currentWrite.Contains(w) { - log.Printf("Revoking ungranted write permission %s", w) + plog.Noticef("revoking ungranted write permission %s", w) continue } currentWrite.Remove(w) diff --git a/etcdserver/security/security_requests.go b/etcdserver/security/security_requests.go index 42e59f735..6ad627ec0 100644 --- a/etcdserver/security/security_requests.go +++ b/etcdserver/security/security_requests.go @@ -16,7 +16,6 @@ package security import ( "encoding/json" - "log" "path" "github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context" @@ -46,7 +45,7 @@ func (s *Store) ensureSecurityDirectories() error { continue } } - log.Println("security: Trying to create security directories in the store; failed:", err) + plog.Errorf("failed to create security directories in the store (%v)", err) return err } } @@ -93,14 +92,14 @@ func (s *Store) detectSecurity() bool { return false } } - log.Println("security: Trying to detect security settings failed:", err) + plog.Errorf("failed to detect security settings (%s)", err) return false } var u bool err = json.Unmarshal([]byte(*value.Event.Node.Value), &u) if err != nil { - log.Println("security: internal bookkeeping value for enabled isn't valid JSON") + plog.Errorf("internal bookkeeping value for enabled isn't valid JSON (%v)", err) return false } return u From f013a627a4177f4dfc134a1914696f1cfc31429d Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 11 Jun 2015 09:40:44 -0700 Subject: [PATCH 07/11] etcdserver/stats: use leveled log --- etcdserver/stats/leader.go | 3 +-- etcdserver/stats/stats.go | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/etcdserver/stats/leader.go b/etcdserver/stats/leader.go index eb7852c3e..a56c9b327 100644 --- a/etcdserver/stats/leader.go +++ b/etcdserver/stats/leader.go @@ -16,7 +16,6 @@ package stats import ( "encoding/json" - "log" "math" "sync" "time" @@ -47,7 +46,7 @@ func (ls *LeaderStats) JSON() []byte { b, err := json.Marshal(stats) // TODO(jonboulle): appropriate error handling? if err != nil { - log.Printf("stats: error marshalling leader stats: %v", err) + plog.Errorf("error marshalling leader stats (%v)", err) } return b } diff --git a/etcdserver/stats/stats.go b/etcdserver/stats/stats.go index ffd92245f..5472393a8 100644 --- a/etcdserver/stats/stats.go +++ b/etcdserver/stats/stats.go @@ -14,6 +14,12 @@ package stats +import "github.com/coreos/pkg/capnslog" + +var ( + plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver", "stats") +) + type Stats interface { // SelfStats returns the struct representing statistics of this server SelfStats() []byte From 2db8b53c4b338fb1b8ac2955ead91a3af5d86253 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 11 Jun 2015 09:48:10 -0700 Subject: [PATCH 08/11] discovery: use leveled log --- discovery/discovery.go | 18 ++++++++++-------- discovery/srv.go | 13 ++++++------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/discovery/discovery.go b/discovery/discovery.go index 85ca071f4..fe80659d1 100644 --- a/discovery/discovery.go +++ b/discovery/discovery.go @@ -17,7 +17,6 @@ package discovery import ( "errors" "fmt" - "log" "math" "net/http" "net/url" @@ -31,9 +30,12 @@ import ( "github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context" "github.com/coreos/etcd/client" "github.com/coreos/etcd/pkg/types" + "github.com/coreos/pkg/capnslog" ) var ( + plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "discovery") + ErrInvalidURL = errors.New("discovery: invalid URL") ErrBadSizeKey = errors.New("discovery: size key is bad") ErrSizeNotFound = errors.New("discovery: size key not found") @@ -102,7 +104,7 @@ func newProxyFunc(proxy string) (func(*http.Request) (*url.URL, error), error) { return nil, fmt.Errorf("invalid proxy address %q: %v", proxy, err) } - log.Printf("discovery: using proxy %q", proxyURL.String()) + plog.Infof("using proxy %q", proxyURL.String()) return http.ProxyURL(proxyURL), nil } @@ -250,7 +252,7 @@ func (d *discovery) checkCluster() ([]*client.Node, int, uint64, error) { func (d *discovery) logAndBackoffForRetry(step string) { d.retries++ retryTime := time.Second * (0x1 << d.retries) - log.Println("discovery: during", step, "connection to", d.url, "timed out, retrying in", retryTime) + plog.Infoln("during", step, "connection to", d.url, "timed out, retrying in", retryTime) d.clock.Sleep(retryTime) } @@ -284,15 +286,15 @@ func (d *discovery) waitNodes(nodes []*client.Node, size int, index uint64) ([]* copy(all, nodes) for _, n := range all { if path.Base(n.Key) == path.Base(d.selfKey()) { - log.Printf("discovery: found self %s in the cluster", path.Base(d.selfKey())) + plog.Noticef("found self %s in the cluster", path.Base(d.selfKey())) } else { - log.Printf("discovery: found peer %s in the cluster", path.Base(n.Key)) + plog.Noticef("found peer %s in the cluster", path.Base(n.Key)) } } // wait for others for len(all) < size { - log.Printf("discovery: found %d peer(s), waiting for %d more", len(all), size-len(all)) + plog.Noticef("found %d peer(s), waiting for %d more", len(all), size-len(all)) resp, err := w.Next(context.Background()) if err != nil { if err == context.DeadlineExceeded { @@ -300,10 +302,10 @@ func (d *discovery) waitNodes(nodes []*client.Node, size int, index uint64) ([]* } return nil, err } - log.Printf("discovery: found peer %s in the cluster", path.Base(resp.Node.Key)) + plog.Noticef("found peer %s in the cluster", path.Base(resp.Node.Key)) all = append(all, resp.Node) } - log.Printf("discovery: found %d needed peer(s)", len(all)) + plog.Noticef("found %d needed peer(s)", len(all)) return all, nil } diff --git a/discovery/srv.go b/discovery/srv.go index 6ad79feeb..4ebc3d9aa 100644 --- a/discovery/srv.go +++ b/discovery/srv.go @@ -16,7 +16,6 @@ package discovery import ( "fmt" - "log" "net" "strings" @@ -41,7 +40,7 @@ func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (st for _, url := range apurls { tcpAddr, err := resolveTCPAddr("tcp", url.Host) if err != nil { - log.Printf("discovery: Couldn't resolve host %s during SRV discovery", url.Host) + plog.Errorf("couldn't resolve host %s during SRV discovery", url.Host) return "", "", err } tcpAPUrls = append(tcpAPUrls, tcpAddr.String()) @@ -57,7 +56,7 @@ func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (st host := net.JoinHostPort(target, fmt.Sprintf("%d", srv.Port)) tcpAddr, err := resolveTCPAddr("tcp", host) if err != nil { - log.Printf("discovery: Couldn't resolve host %s during SRV discovery", host) + plog.Warningf("couldn't resolve host %s during SRV discovery", host) continue } n := "" @@ -71,7 +70,7 @@ func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (st tempName += 1 } stringParts = append(stringParts, fmt.Sprintf("%s=%s%s", n, prefix, host)) - log.Printf("discovery: Got bootstrap from DNS for %s at %s%s", service, prefix, host) + plog.Noticef("got bootstrap from DNS for %s at %s%s", service, prefix, host) } return nil } @@ -79,16 +78,16 @@ func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (st failCount := 0 err := updateNodeMap("etcd-server-ssl", "https://") if err != nil { - log.Printf("discovery: Error querying DNS SRV records for _etcd-server-ssl %s", err) + plog.Warningf("error querying DNS SRV records for _etcd-server-ssl %s", err) failCount += 1 } err = updateNodeMap("etcd-server", "http://") if err != nil { - log.Printf("discovery: Error querying DNS SRV records for _etcd-server %s", err) + plog.Warningf("discovery: error querying DNS SRV records for _etcd-server %s", err) failCount += 1 } if failCount == 2 { - log.Printf("discovery: SRV discovery failed: too many errors querying DNS SRV records") + plog.Errorf("SRV discovery failed: too many errors querying DNS SRV records") return "", "", err } return strings.Join(stringParts, ","), defaultToken, nil From 2373fd8426bd0a242028e4c6e9ace17067904f1a Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 11 Jun 2015 09:52:11 -0700 Subject: [PATCH 09/11] wal: fix the left logging using default log --- wal/repair.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/wal/repair.go b/wal/repair.go index 979df647b..d18112553 100644 --- a/wal/repair.go +++ b/wal/repair.go @@ -16,7 +16,6 @@ package wal import ( "io" - "log" "os" "path" @@ -58,35 +57,35 @@ func Repair(dirpath string) bool { case io.EOF: return true case io.ErrUnexpectedEOF: - log.Printf("wal: repairing %v", f.Name()) + plog.Noticef("repairing %v", f.Name()) bf, bferr := os.Create(f.Name() + ".broken") if bferr != nil { - log.Printf("wal: could not repair %v, failed to create backup file", f.Name()) + plog.Errorf("could not repair %v, failed to create backup file", f.Name()) return false } defer bf.Close() if _, err = f.Seek(0, os.SEEK_SET); err != nil { - log.Printf("wal: could not repair %v, failed to read file", f.Name()) + plog.Errorf("could not repair %v, failed to read file", f.Name()) return false } if _, err = io.Copy(bf, f); err != nil { - log.Printf("wal: could not repair %v, failed to copy file", f.Name()) + plog.Errorf("could not repair %v, failed to copy file", f.Name()) return false } if err = f.Truncate(int64(n)); err != nil { - log.Printf("wal: could not repair %v, failed to truncate file", f.Name()) + plog.Errorf("could not repair %v, failed to truncate file", f.Name()) return false } if err = f.Sync(); err != nil { - log.Printf("wal: could not repair %v, failed to sync file", f.Name()) + plog.Errorf("could not repair %v, failed to sync file", f.Name()) return false } return true default: - log.Printf("wal: could not repair error (%v)", err) + plog.Errorf("could not repair error (%v)", err) return false } } From 8ad7ed321e3601cb834f8950a29113e3b661c63f Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 11 Jun 2015 09:54:39 -0700 Subject: [PATCH 10/11] *:godep log pkg --- discovery/discovery.go | 2 +- etcdserver/etcdhttp/httptypes/errors.go | 2 +- etcdserver/security/security.go | 2 +- etcdserver/stats/stats.go | 2 +- pkg/flags/flag.go | 2 +- pkg/netutil/netutil.go | 2 +- pkg/osutil/osutil.go | 2 +- pkg/pbutil/pbutil.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/discovery/discovery.go b/discovery/discovery.go index fe80659d1..8bb1b06dc 100644 --- a/discovery/discovery.go +++ b/discovery/discovery.go @@ -26,11 +26,11 @@ import ( "strings" "time" + "github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog" "github.com/coreos/etcd/Godeps/_workspace/src/github.com/jonboulle/clockwork" "github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context" "github.com/coreos/etcd/client" "github.com/coreos/etcd/pkg/types" - "github.com/coreos/pkg/capnslog" ) var ( diff --git a/etcdserver/etcdhttp/httptypes/errors.go b/etcdserver/etcdhttp/httptypes/errors.go index 387a01729..06434bf73 100644 --- a/etcdserver/etcdhttp/httptypes/errors.go +++ b/etcdserver/etcdhttp/httptypes/errors.go @@ -18,7 +18,7 @@ import ( "encoding/json" "net/http" - "github.com/coreos/pkg/capnslog" + "github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog" ) var ( diff --git a/etcdserver/security/security.go b/etcdserver/security/security.go index 15d834a20..bc3cf39ea 100644 --- a/etcdserver/security/security.go +++ b/etcdserver/security/security.go @@ -23,13 +23,13 @@ import ( "strings" "time" + "github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog" "github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/crypto/bcrypt" "github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context" etcderr "github.com/coreos/etcd/error" "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/pkg/types" - "github.com/coreos/pkg/capnslog" ) const ( diff --git a/etcdserver/stats/stats.go b/etcdserver/stats/stats.go index 5472393a8..5bda72327 100644 --- a/etcdserver/stats/stats.go +++ b/etcdserver/stats/stats.go @@ -14,7 +14,7 @@ package stats -import "github.com/coreos/pkg/capnslog" +import "github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog" var ( plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver", "stats") diff --git a/pkg/flags/flag.go b/pkg/flags/flag.go index ff368ef4f..ba64212bd 100644 --- a/pkg/flags/flag.go +++ b/pkg/flags/flag.go @@ -21,8 +21,8 @@ import ( "os" "strings" + "github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog" "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/pkg/capnslog" ) var ( diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go index 04b764cdf..423871f30 100644 --- a/pkg/netutil/netutil.go +++ b/pkg/netutil/netutil.go @@ -21,7 +21,7 @@ import ( "net/url" "strings" - "github.com/coreos/pkg/capnslog" + "github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog" ) var ( diff --git a/pkg/osutil/osutil.go b/pkg/osutil/osutil.go index 0c9f27f61..6e8f9f035 100644 --- a/pkg/osutil/osutil.go +++ b/pkg/osutil/osutil.go @@ -18,7 +18,7 @@ import ( "os" "strings" - "github.com/coreos/pkg/capnslog" + "github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog" ) var ( diff --git a/pkg/pbutil/pbutil.go b/pkg/pbutil/pbutil.go index 64bd5cdd5..5e154cace 100644 --- a/pkg/pbutil/pbutil.go +++ b/pkg/pbutil/pbutil.go @@ -14,7 +14,7 @@ package pbutil -import "github.com/coreos/pkg/capnslog" +import "github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog" var ( plog = capnslog.NewPackageLogger("github.com/coreos/etcd/pkg", "flags") From 2c5ab7ff8b710e999c7071b32f9b272aac218546 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 11 Jun 2015 09:57:45 -0700 Subject: [PATCH 11/11] discovery: fix infoln -> info --- discovery/discovery.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discovery/discovery.go b/discovery/discovery.go index 8bb1b06dc..34ee76916 100644 --- a/discovery/discovery.go +++ b/discovery/discovery.go @@ -252,7 +252,7 @@ func (d *discovery) checkCluster() ([]*client.Node, int, uint64, error) { func (d *discovery) logAndBackoffForRetry(step string) { d.retries++ retryTime := time.Second * (0x1 << d.retries) - plog.Infoln("during", step, "connection to", d.url, "timed out, retrying in", retryTime) + plog.Info("during", step, "connection to", d.url, "timed out, retrying in", retryTime) d.clock.Sleep(retryTime) }