From 84239b4a149c16ea4e5294ba17fd6d9e2433a772 Mon Sep 17 00:00:00 2001 From: Reed Allman Date: Thu, 21 Sep 2017 04:32:56 -0700 Subject: [PATCH] remove idle_timeout > timeout check. d'oh --- api/models/error.go | 4 ---- api/models/route.go | 4 ---- api/server/routes_test.go | 1 - 3 files changed, 9 deletions(-) diff --git a/api/models/error.go b/api/models/error.go index 504cdb70d..e80dfaa3f 100644 --- a/api/models/error.go +++ b/api/models/error.go @@ -156,10 +156,6 @@ var ( code: http.StatusBadRequest, error: fmt.Errorf("memory value is invalid. 0 < memory < %d", MaxMemory), } - ErrRoutesTimeoutLongerThanIdle = err{ - code: http.StatusBadRequest, - error: errors.New("timeout must be less than idle_timeout"), - } ErrCallNotFound = err{ code: http.StatusNotFound, error: errors.New("Call not found"), diff --git a/api/models/route.go b/api/models/route.go index 5633fd07a..bf8e87f9c 100644 --- a/api/models/route.go +++ b/api/models/route.go @@ -109,10 +109,6 @@ func (r *Route) Validate() error { return ErrRoutesInvalidIdleTimeout } - if r.Timeout > r.IdleTimeout { - return ErrRoutesTimeoutLongerThanIdle - } - if r.Memory < 1 || r.Memory > MaxMemory { return ErrRoutesInvalidMemory } diff --git a/api/server/routes_test.go b/api/server/routes_test.go index 414980571..e786423f6 100644 --- a/api/server/routes_test.go +++ b/api/server/routes_test.go @@ -290,7 +290,6 @@ func TestRouteUpdate(t *testing.T) { {ds, logs.NewMock(), http.MethodPatch, "/v1/apps/a/routes/myroute/do", `{ "route": { "type": "async", "timeout": 3601 } }`, http.StatusBadRequest, models.ErrRoutesInvalidTimeout}, {ds, logs.NewMock(), http.MethodPatch, "/v1/apps/a/routes/myroute/do", `{ "route": { "type": "async", "timeout": 121, "idle_timeout": 240 } }`, http.StatusOK, nil}, // should work if async {ds, logs.NewMock(), http.MethodPatch, "/v1/apps/a/routes/myroute/do", `{ "route": { "idle_timeout": 3601 } }`, http.StatusBadRequest, models.ErrRoutesInvalidIdleTimeout}, - {ds, logs.NewMock(), http.MethodPatch, "/v1/apps/a/routes/myroute/do", `{ "route": { "timeout": 241 } }`, http.StatusBadRequest, models.ErrRoutesTimeoutLongerThanIdle}, {ds, logs.NewMock(), http.MethodPatch, "/v1/apps/a/routes/myroute/do", `{ "route": { "memory": 100000000000000 } }`, http.StatusBadRequest, models.ErrRoutesInvalidMemory}, // TODO this should be correct, waiting for patch to come in //{ds, logs.NewMock(), http.MethodPatch, "/v1/apps/b/routes/myroute/dont", `{ "route": {} }`, http.StatusNotFound, models.ErrAppsNotFound},