Merge pull request #398 from erizocosmico/fix/timeouts

ajnavarro · web-flow · commit fd568d4c7493 · 2018-10-04T14:11:21.000+02:00
server: do not set timeouts by default
diff --git a/server/server.go b/server/server.go
@@ -9,11 +9,6 @@ import (
 	"gopkg.in/src-d/go-vitess.v1/mysql"
 )
 
-const (
-	DefaultConnReadTimeout  = 30 * time.Second
-	DefaultConnWriteTimeout = 60 * time.Second
-)
-
 // Server is a MySQL server for SQLe engines.
 type Server struct {
 	Listener *mysql.Listener
@@ -50,12 +45,12 @@ func NewServer(cfg Config, e *sqle.Engine, sb SessionBuilder) (*Server, error) {
 		tracer = opentracing.NoopTracer{}
 	}
 
-	if cfg.ConnReadTimeout == 0 {
-		cfg.ConnReadTimeout = DefaultConnReadTimeout
+	if cfg.ConnReadTimeout < 0 {
+		cfg.ConnReadTimeout = 0
 	}
 
-	if cfg.ConnWriteTimeout == 0 {
-		cfg.ConnWriteTimeout = DefaultConnWriteTimeout
+	if cfg.ConnWriteTimeout < 0 {
+		cfg.ConnWriteTimeout = 0
 	}
 
 	handler := NewHandler(e, NewSessionManager(sb, tracer, cfg.Address))

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,6 @@ import (`
`9`	`9`	`"gopkg.in/src-d/go-vitess.v1/mysql"`
`10`	`10`	`)`
`11`	`11`
`12`		`-const (`
`13`		`- DefaultConnReadTimeout = 30 * time.Second`
`14`		`- DefaultConnWriteTimeout = 60 * time.Second`
`15`		`-)`
`16`		`-`
`17`	`12`	`// Server is a MySQL server for SQLe engines.`
`18`	`13`	`type Server struct {`
`19`	`14`	`Listener *mysql.Listener`
`@@ -50,12 +45,12 @@ func NewServer(cfg Config, e sqle.Engine, sb SessionBuilder) (Server, error) {`
`50`	`45`	`tracer = opentracing.NoopTracer{}`
`51`	`46`	`}`
`52`	`47`
`53`		`- if cfg.ConnReadTimeout == 0 {`
`54`		`- cfg.ConnReadTimeout = DefaultConnReadTimeout`
	`48`	`+ if cfg.ConnReadTimeout < 0 {`
	`49`	`+ cfg.ConnReadTimeout = 0`
`55`	`50`	`}`
`56`	`51`
`57`		`- if cfg.ConnWriteTimeout == 0 {`
`58`		`- cfg.ConnWriteTimeout = DefaultConnWriteTimeout`
	`52`	`+ if cfg.ConnWriteTimeout < 0 {`
	`53`	`+ cfg.ConnWriteTimeout = 0`
`59`	`54`	`}`
`60`	`55`
`61`	`56`	`handler := NewHandler(e, NewSessionManager(sb, tracer, cfg.Address))`