From ab90369f9e74e695ec6765553e864fae200b1d6a Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.co>
Date: Wed, 22 Oct 2014 16:24:50 -0700
Subject: [PATCH] etcdserver: use hex for cluster and machine id

Continue using hex everywhere. Including here.

TODO: cleanup the printing of the structs which currently have decimal
to/from:

`{Type:MsgAppResp To:9973738105406047488 From:17050684879817348455 T...`
---
 etcdserver/etcdhttp/http.go | 2 +-
 etcdserver/server.go        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etcdserver/etcdhttp/http.go b/etcdserver/etcdhttp/http.go
index 13f8161e9..03ed040fa 100644
--- a/etcdserver/etcdhttp/http.go
+++ b/etcdserver/etcdhttp/http.go
@@ -244,7 +244,7 @@ func (h serverHandler) serveRaft(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "error unmarshaling raft message", http.StatusBadRequest)
 		return
 	}
-	log.Printf("etcdhttp: raft recv message from %#x: %+v", m.From, m)
+	log.Printf("etcdhttp: raft recv message from %x: %+v", m.From, m)
 	if err := h.server.Process(context.TODO(), m); err != nil {
 		log.Println("etcdhttp: error processing raft message:", err)
 		switch err {
diff --git a/etcdserver/server.go b/etcdserver/server.go
index 22912b865..0a63099f9 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -683,7 +683,7 @@ func restartNode(cfg *ServerConfig, index uint64, snapshot *raftpb.Snapshot) (id
 	var metadata pb.Metadata
 	pbutil.MustUnmarshal(&metadata, wmetadata)
 	id, cid = metadata.NodeID, metadata.ClusterID
-	log.Printf("etcdserver: restart node %d in cluster %d at commit index %d", id, cid, st.Commit)
+	log.Printf("etcdserver: restart member %x in cluster %x at commit index %d", id, cid, st.Commit)
 	n = raft.RestartNode(id, 10, 1, snapshot, st, ents)
 	return
 }