From d0604c7d5c20bd5821884aa939f89e017e661c6b Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 27 Oct 2014 15:32:36 -0700 Subject: [PATCH] error: write->writeTo --- error/error.go | 2 +- etcdserver/etcdhttp/http.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/error/error.go b/error/error.go index a140f90b8..33869de07 100644 --- a/error/error.go +++ b/error/error.go @@ -133,7 +133,7 @@ func (e Error) toJsonString() string { return string(b) } -func (e Error) Write(w http.ResponseWriter) { +func (e Error) WriteTo(w http.ResponseWriter) { w.Header().Add("X-Etcd-Index", fmt.Sprint(e.Index)) // 3xx is raft internal error status := http.StatusBadRequest diff --git a/etcdserver/etcdhttp/http.go b/etcdserver/etcdhttp/http.go index 8350e9a51..b01ae471c 100644 --- a/etcdserver/etcdhttp/http.go +++ b/etcdserver/etcdhttp/http.go @@ -45,7 +45,7 @@ func writeError(w http.ResponseWriter, err error) { } log.Println(err) if e, ok := err.(*etcdErr.Error); ok { - e.Write(w) + e.WriteTo(w) } else { http.Error(w, "Internal Server Error", http.StatusInternalServerError) }