github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

consul: Ignore zero ttl on session

pull/536/head^2
Armon Dadgar 2014-12-12 19:17:04 -08:00
parent bb1ba3a167
commit a5a9f051cd
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
command/agent/session_endpoint.go
View File

@ -2,11 +2,12 @@ package agent
import ( import (
"fmt" "fmt"
"github.com/hashicorp/consul/consul"
"github.com/hashicorp/consul/consul/structs"
"net/http" "net/http"
"strings" "strings"
"time" "time"
"github.com/hashicorp/consul/consul"
"github.com/hashicorp/consul/consul/structs"
) )
const ( const (
@ -61,7 +62,7 @@ func (s *HTTPServer) SessionCreate(resp http.ResponseWriter, req *http.Request)
return nil, nil return nil, nil
} }
if ttl < structs.SessionTTLMin || ttl > structs.SessionTTLMax { if ttl != 0 && (ttl < structs.SessionTTLMin || ttl > structs.SessionTTLMax) {
resp.WriteHeader(400) resp.WriteHeader(400)
resp.Write([]byte(fmt.Sprintf("Request TTL '%s', must be between [%v-%v]", args.Session.TTL, structs.SessionTTLMin, structs.SessionTTLMax))) resp.Write([]byte(fmt.Sprintf("Request TTL '%s', must be between [%v-%v]", args.Session.TTL, structs.SessionTTLMin, structs.SessionTTLMax)))
return nil, nil return nil, nil

2
consul/session_endpoint.go
View File

@ -47,7 +47,7 @@ func (s *Session) Apply(args *structs.SessionRequest, reply *string) error {
return fmt.Errorf("Session TTL '%s' invalid: %v", args.Session.TTL, err) return fmt.Errorf("Session TTL '%s' invalid: %v", args.Session.TTL, err)
} }
if ttl < structs.SessionTTLMin || ttl > structs.SessionTTLMax { if ttl != 0 && (ttl < structs.SessionTTLMin || ttl > structs.SessionTTLMax) {
return fmt.Errorf("Invalid Session TTL '%d', must be between [%v=%v]", return fmt.Errorf("Invalid Session TTL '%d', must be between [%v=%v]",
ttl, structs.SessionTTLMin, structs.SessionTTLMax) ttl, structs.SessionTTLMin, structs.SessionTTLMax)
} }

2
consul/state_store.go
View File

@ -1342,7 +1342,7 @@ func (s *StateStore) SessionCreate(index uint64, session *structs.Session) error
return fmt.Errorf("Invalid Session TTL '%s': %v", session.TTL, err) return fmt.Errorf("Invalid Session TTL '%s': %v", session.TTL, err)
} }
if ttl < structs.SessionTTLMin || ttl > structs.SessionTTLMax { if ttl != 0 && (ttl < structs.SessionTTLMin || ttl > structs.SessionTTLMax) {
return fmt.Errorf("Invalid Session TTL '%s', must be between [%v-%v]", return fmt.Errorf("Invalid Session TTL '%s', must be between [%v-%v]",
session.TTL, structs.SessionTTLMin, structs.SessionTTLMax) session.TTL, structs.SessionTTLMin, structs.SessionTTLMax)
} }