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

etcdhttp: remove configurable timeout

Browse Source 
It's slightly unclear why we expose this timeout as being configurable,
and the `-timeout` flag does not exist in 0.4.x, so for now, remove the
flag until we have evidence that it is needed.
This commit is contained in:
Jonathan Boulle 2014-10-03 13:47:34 -07:00
parent 1ca5991c8c
commit f432b9d29b
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etcdserver/etcdhttp/http.go
View File

@ -35,15 +35,12 @@ const (
var errClosed = errors.New("etcdhttp: client closed connection") var errClosed = errors.New("etcdhttp: client closed connection")
// NewClientHandler generates a muxed http.Handler with the given parameters to serve etcd client requests. // NewClientHandler generates a muxed http.Handler with the given parameters to serve etcd client requests.
func NewClientHandler(server *etcdserver.EtcdServer, timeout time.Duration) http.Handler { func NewClientHandler(server *etcdserver.EtcdServer) http.Handler {
sh := &serverHandler{ sh := &serverHandler{
server: server, server: server,
clusterStore: server.ClusterStore, clusterStore: server.ClusterStore,
timer: server, timer: server,
timeout: timeout, timeout: defaultServerTimeout,
}
if sh.timeout == 0 {
sh.timeout = defaultServerTimeout
} }
mux := http.NewServeMux() mux := http.NewServeMux()
mux.HandleFunc(keysPrefix, sh.serveKeys) mux.HandleFunc(keysPrefix, sh.serveKeys)

2
etcdserver/etcdhttp/http_test.go
View File

@ -591,7 +591,7 @@ func TestV2MachinesEndpoint(t *testing.T) {
{"POST", http.StatusMethodNotAllowed}, {"POST", http.StatusMethodNotAllowed},
} }
m := NewClientHandler(&etcdserver.EtcdServer{ClusterStore: &fakeCluster{}}, time.Hour) m := NewClientHandler(&etcdserver.EtcdServer{ClusterStore: &fakeCluster{}})
s := httptest.NewServer(m) s := httptest.NewServer(m)
defer s.Close() defer s.Close()

4
main.go
View File

@ -7,7 +7,6 @@ import (
"net/http" "net/http"
"os" "os"
"strings" "strings"
"time"
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/etcdhttp" "github.com/coreos/etcd/etcdserver/etcdhttp"
@ -27,7 +26,6 @@ const (
var ( var (
name = flag.String("name", "default", "Unique human-readable name for this node") name = flag.String("name", "default", "Unique human-readable name for this node")
timeout = flag.Duration("timeout", 10*time.Second, "Request Timeout")
dir = flag.String("data-dir", "", "Path to the data directory") dir = flag.String("data-dir", "", "Path to the data directory")
snapCount = flag.Uint64("snapshot-count", etcdserver.DefaultSnapCount, "Number of committed transactions to trigger a snapshot") snapCount = flag.Uint64("snapshot-count", etcdserver.DefaultSnapCount, "Number of committed transactions to trigger a snapshot")
printVersion = flag.Bool("version", false, "Print the version and exit") printVersion = flag.Bool("version", false, "Print the version and exit")
@ -150,7 +148,7 @@ func startEtcd() {
s.Start() s.Start()
ch := &pkg.CORSHandler{ ch := &pkg.CORSHandler{
Handler: etcdhttp.NewClientHandler(s, *timeout), Handler: etcdhttp.NewClientHandler(s),
Info: cors, Info: cors,
} }
ph := etcdhttp.NewPeerHandler(s) ph := etcdhttp.NewPeerHandler(s)