vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1091 from runcom/cmux-http-read-timeout-v1

Browse source 
[release-1.0] cmd: crio: set ReadTimeout on the info endpoint
This commit is contained in:
Daniel J Walsh 2017-10-30 09:07:06 -04:00 committed by GitHub
commit ae6e74731c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/crio/main.go
View file

@ -10,6 +10,7 @@ import (
"os/signal" "os/signal"
"sort" "sort"
"strings" "strings"
"time"
"github.com/containers/storage/pkg/reexec" "github.com/containers/storage/pkg/reexec"
"github.com/kubernetes-incubator/cri-o/libkpod" "github.com/kubernetes-incubator/cri-o/libkpod"
@ -470,7 +471,8 @@ func main() {
infoMux := service.GetInfoMux() infoMux := service.GetInfoMux()
srv := &http.Server{ srv := &http.Server{
Handler: infoMux, Handler: infoMux,
ReadTimeout: 5 * time.Second,
} }
graceful := false graceful := false