Explorar o código

Merge pull request #1436 from xiangli-cmu/writeTo

error: write->writeTo
Xiang Li %!s(int64=11) %!d(string=hai) anos
pai
achega
7384ee39a6
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
  1. 1 1
      error/error.go
  2. 1 1
      etcdserver/etcdhttp/http.go

+ 1 - 1
error/error.go

@@ -133,7 +133,7 @@ func (e Error) toJsonString() string {
 	return string(b)
 	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))
 	w.Header().Add("X-Etcd-Index", fmt.Sprint(e.Index))
 	// 3xx is raft internal error
 	// 3xx is raft internal error
 	status := http.StatusBadRequest
 	status := http.StatusBadRequest

+ 1 - 1
etcdserver/etcdhttp/http.go

@@ -45,7 +45,7 @@ func writeError(w http.ResponseWriter, err error) {
 	}
 	}
 	log.Println(err)
 	log.Println(err)
 	if e, ok := err.(*etcdErr.Error); ok {
 	if e, ok := err.(*etcdErr.Error); ok {
-		e.Write(w)
+		e.WriteTo(w)
 	} else {
 	} else {
 		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 	}
 	}