diff --git a/Gopkg.lock b/Gopkg.lock index 5064b3d2..289bb594 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -933,7 +933,7 @@ [[projects]] branch = "master" - digest = "1:b1b3870d2746e5277761a3c2811d2b486db20a09763a1d98476cf82f2afbc0fc" + digest = "1:bfedb6d5106671cef84df18463d0fbf360a85916980675aac8b49690fd594c36" name = "knative.dev/pkg" packages = [ "apis", @@ -952,7 +952,7 @@ "metrics/metricskey", ] pruneopts = "T" - revision = "4836f680bbe5dc615e9c822f21c6685d97c6d553" + revision = "d9e3e244a6c044379b71d90b7440daad5b7910f3" [[projects]] branch = "master" @@ -963,7 +963,7 @@ "tools/dep-collector", ] pruneopts = "UT" - revision = "e381f11dc722330fe082158e2f22cd39f8fe8375" + revision = "6faacbd40140c782d8a1261321b99a402967a6a8" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/Gopkg.lock b/vendor/knative.dev/pkg/Gopkg.lock index b9b10ad2..1b8db47c 100644 --- a/vendor/knative.dev/pkg/Gopkg.lock +++ b/vendor/knative.dev/pkg/Gopkg.lock @@ -1290,6 +1290,7 @@ "github.com/davecgh/go-spew/spew", "github.com/evanphx/json-patch", "github.com/ghodss/yaml", + "github.com/golang/glog", "github.com/golang/protobuf/jsonpb", "github.com/golang/protobuf/proto", "github.com/google/go-cmp/cmp", diff --git a/vendor/knative.dev/pkg/test/e2e_flags.go b/vendor/knative.dev/pkg/test/e2e_flags.go index 978671f4..c5d74928 100644 --- a/vendor/knative.dev/pkg/test/e2e_flags.go +++ b/vendor/knative.dev/pkg/test/e2e_flags.go @@ -27,6 +27,7 @@ import ( "path" "sync" + _ "github.com/golang/glog" // Needed if glog and klog are to coexist "k8s.io/klog" "knative.dev/pkg/test/logging" ) @@ -41,7 +42,7 @@ const ( var ( flagsSetupOnce = &sync.Once{} - + klogFlags = flag.NewFlagSet("klog", flag.ExitOnError) // Flags holds the command line flags or defaults for settings in the user's environment. // See EnvironmentFlags for a list of supported fields. Flags = initializeFlags() @@ -89,7 +90,7 @@ func initializeFlags() *EnvironmentFlags { flag.StringVar(&f.Tag, "tag", "latest", "Provide the version tag for the test images.") - klog.InitFlags(nil) + klog.InitFlags(klogFlags) flag.Set("v", klogDefaultLogLevel) flag.Set("alsologtostderr", "true") @@ -107,13 +108,22 @@ func printFlags() { // SetupLoggingFlags initializes the logging libraries at runtime func SetupLoggingFlags() { flagsSetupOnce.Do(func() { + // Sync the glog flags to klog + flag.CommandLine.VisitAll(func(f1 *flag.Flag) { + f2 := klogFlags.Lookup(f1.Name) + if f2 != nil { + value := f1.Value.String() + f2.Value.Set(value) + } + }) if Flags.LogVerbose { // If klog verbosity is not set to a non-default value (via "-args -v=X"), if flag.CommandLine.Lookup("v").Value.String() == klogDefaultLogLevel { // set up verbosity for klog so round_trippers.go prints: // URL, request headers, response headers, and partial response body // See levels in vendor/k8s.io/client-go/transport/round_trippers.go:DebugWrappers for other options - flag.Set("v", "8") + klogFlags.Set("v", "8") + flag.Set("v", "8") // This is for glog, since glog=>klog sync is one-time } printFlags() }