github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #72521 from dims/ensure-capture-of-http-and-trace-logs 

Ensure we capture http and trace related logs
pull/564/head
Kubernetes Prow Robot 2019-01-03 15:52:06 -08:00 committed by GitHub
parent 78f22e1df9 e6f8e51c50
commit 18778ea4a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/integration/framework/master_utils.go
View File

@ -17,10 +17,12 @@ limitations under the License.
package framework package framework
import ( import (
"flag"
"net" "net"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"path" "path"
"strconv"
"time" "time"
"github.com/go-openapi/spec" "github.com/go-openapi/spec"
@ -112,6 +114,13 @@ func startMasterOrDie(masterConfig *master.Config, incomingServer *httptest.Serv
var m *master.Master var m *master.Master
var s *httptest.Server var s *httptest.Server
// Ensure we log at least level 4
v := flag.Lookup("v").Value
level, _ := strconv.Atoi(v.String())
if level < 4 {
v.Set("4")
}
if incomingServer != nil { if incomingServer != nil {
s = incomingServer s = incomingServer
} else { } else {