Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #292 from xiangli-cmu/fix-ttl

Browse Source 
WIP: fix ttl
This commit is contained in:
Xiang Li
2013-11-11 21:30:32 -08:00
parent fc25ef8383 811c577fe8
commit 5abbaf59e3
40 changed files with 728 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
error/error.go
View File

@@ -80,16 +80,14 @@ type Error struct {
Message string `json:"message"`
Cause string `json:"cause,omitempty"`
Index uint64 `json:"index"`
Term uint64 `json:"term"`
}
func NewError(errorCode int, cause string, index uint64, term uint64) *Error {
func NewError(errorCode int, cause string, index uint64) *Error {
return &Error{
ErrorCode: errorCode,
Message: errors[errorCode],
Cause: cause,
Index: index,
Term: term,
}
}
@@ -109,7 +107,6 @@ func (e Error) toJsonString() string {
func (e Error) Write(w http.ResponseWriter) {
w.Header().Add("X-Etcd-Index", fmt.Sprint(e.Index))
w.Header().Add("X-Etcd-Term", fmt.Sprint(e.Term))
// 3xx is reft internal error
if e.ErrorCode/100 == 3 {
http.Error(w, e.toJsonString(), http.StatusInternalServerError)