diff --git a/etcdserver/etcdhttp/client.go b/etcdserver/etcdhttp/client.go index 7c202767e..4ac224ce4 100644 --- a/etcdserver/etcdhttp/client.go +++ b/etcdserver/etcdhttp/client.go @@ -193,7 +193,6 @@ func (h *membersHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { writeError(w, err) return } - log.Printf("etcdhttp: added node %x with peer urls %s", m.ID, req.PeerURLs) res := newMember(m) w.Header().Set("Content-Type", "application/json") diff --git a/etcdserver/sender.go b/etcdserver/sender.go index b9ce9357f..00a6c6c78 100644 --- a/etcdserver/sender.go +++ b/etcdserver/sender.go @@ -59,7 +59,7 @@ func send(c *http.Client, cl *Cluster, m raftpb.Message, ss *stats.ServerStats, // TODO: unknown peer id.. what do we do? I // don't think his should ever happen, need to // look into this further. - log.Printf("etcdhttp: error sending message to unknown receiver %s", strutil.IDAsHex(m.To)) + log.Printf("etcdserver: error sending message to unknown receiver %s", strutil.IDAsHex(m.To)) } return } @@ -69,7 +69,7 @@ func send(c *http.Client, cl *Cluster, m raftpb.Message, ss *stats.ServerStats, // of messages out at a time. data, err := m.Marshal() if err != nil { - log.Println("etcdhttp: dropping message:", err) + log.Println("sender: dropping message:", err) return // drop bad message } if m.Type == raftpb.MsgApp { diff --git a/etcdserver/server.go b/etcdserver/server.go index e0e9be6b1..b8e6028c5 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -465,7 +465,6 @@ func (s *EtcdServer) Term() uint64 { func (s *EtcdServer) configure(ctx context.Context, cc raftpb.ConfChange) error { ch := s.w.Register(cc.ID) if err := s.node.ProposeConfChange(ctx, cc); err != nil { - log.Printf("configure error: %v", err) s.w.Trigger(cc.ID, nil) return err } diff --git a/etcdserver/stats/leader.go b/etcdserver/stats/leader.go index 115df127e..8afa60294 100644 --- a/etcdserver/stats/leader.go +++ b/etcdserver/stats/leader.go @@ -49,7 +49,7 @@ func (ls *LeaderStats) JSON() []byte { b, err := json.Marshal(stats) // TODO(jonboulle): appropriate error handling? if err != nil { - log.Printf("error marshalling leader stats: %v", err) + log.Printf("stats: error marshalling leader stats: %v", err) } return b } diff --git a/etcdserver/stats/server.go b/etcdserver/stats/server.go index 60b28e240..90772486e 100644 --- a/etcdserver/stats/server.go +++ b/etcdserver/stats/server.go @@ -64,7 +64,7 @@ func (ss *ServerStats) JSON() []byte { b, err := json.Marshal(stats) // TODO(jonboulle): appropriate error handling? if err != nil { - log.Printf("error marshalling server stats: %v", err) + log.Printf("stats: error marshalling server stats: %v", err) } return b } diff --git a/proxy/director.go b/proxy/director.go index c8f23a4c8..3da9a5a25 100644 --- a/proxy/director.go +++ b/proxy/director.go @@ -62,7 +62,7 @@ func (d *director) refresh() { for _, u := range urls { uu, err := url.Parse(u) if err != nil { - log.Printf("upstream URL invalid: %v", err) + log.Printf("proxy: upstream URL invalid: %v", err) continue } endpoints = append(endpoints, newEndpoint(*uu)) diff --git a/snap/snapshotter.go b/snap/snapshotter.go index 32d90a635..b3d0466f0 100644 --- a/snap/snapshotter.go +++ b/snap/snapshotter.go @@ -102,25 +102,25 @@ func loadSnap(dir, name string) (*raftpb.Snapshot, error) { b, err = ioutil.ReadFile(fpath) if err != nil { - log.Printf("Snapshotter cannot read file %v: %v", name, err) + log.Printf("snap: snapshotter cannot read file %v: %v", name, err) return nil, err } var serializedSnap snappb.Snapshot if err = serializedSnap.Unmarshal(b); err != nil { - log.Printf("Corrupted snapshot file %v: %v", name, err) + log.Printf("snap: corrupted snapshot file %v: %v", name, err) return nil, err } crc := crc32.Update(0, crcTable, serializedSnap.Data) if crc != serializedSnap.Crc { - log.Printf("Corrupted snapshot file %v: crc mismatch", name) + log.Printf("snap: corrupted snapshot file %v: crc mismatch", name) err = ErrCRCMismatch return nil, err } var snap raftpb.Snapshot if err = snap.Unmarshal(serializedSnap.Data); err != nil { - log.Printf("Corrupted snapshot file %v: %v", name, err) + log.Printf("snap: corrupted snapshot file %v: %v", name, err) return nil, err } return &snap, nil @@ -152,7 +152,7 @@ func checkSuffix(names []string) []string { if strings.HasSuffix(names[i], snapSuffix) { snaps = append(snaps, names[i]) } else { - log.Printf("Unexpected non-snap file %v", names[i]) + log.Printf("snap: unexpected non-snap file %v", names[i]) } } return snaps @@ -161,6 +161,6 @@ func checkSuffix(names []string) []string { func renameBroken(path string) { brokenPath := path + ".broken" if err := os.Rename(path, brokenPath); err != nil { - log.Printf("Cannot rename broken snapshot file %v to %v: %v", path, brokenPath, err) + log.Printf("snap: cannot rename broken snapshot file %v to %v: %v", path, brokenPath, err) } } diff --git a/wal/util.go b/wal/util.go index 907e81cf9..21cd38d84 100644 --- a/wal/util.go +++ b/wal/util.go @@ -82,7 +82,7 @@ func checkWalNames(names []string) []string { wnames := make([]string, 0) for _, name := range names { if _, _, err := parseWalName(name); err != nil { - log.Printf("parse %s: %v", name, err) + log.Printf("wal: parse %s error: %v", name, err) continue } wnames = append(wnames, name)