From c98f1cb501f973b336541c653b34a00af731eec5 Mon Sep 17 00:00:00 2001 From: Blake Mizerany Date: Tue, 26 Aug 2014 15:42:10 -0700 Subject: [PATCH] etcdserver: remove panic and return default err --- etcdserver2/server.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/etcdserver2/server.go b/etcdserver2/server.go index 7e2beffb9..6d2188bad 100644 --- a/etcdserver2/server.go +++ b/etcdserver2/server.go @@ -1,12 +1,16 @@ package etcdserver import ( + "errors" + "code.google.com/p/go.net/context" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/store" "github.com/coreos/etcd/wait" ) +var ErrUnknownMethod = errors.New("etcdserver: unknown method") + type Response struct { // The last seen term raft was at when this request was built. Term int @@ -95,8 +99,9 @@ func (s *Server) Do(ctx context.Context, r Request) (Response, error) { } return Response{Event: ev}, nil } + default: + return Response{}, ErrUnknownMethod } - panic("not reached") // for some reason the compiler wants this... :/ } // apply interprets r as a call to store.X and returns an Response interpreted from store.Event