summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorpraveensastry <sastry.praveen@gmail.com>2019-08-09 17:13:06 +1000
committerpraveensastry <sastry.praveen@gmail.com>2019-08-09 17:13:06 +1000
commit73985c6545d887644d8aa4f0e00491cc903501c7 (patch)
tree94184c2ba1321965a99e28f8703e1313b916a1e6
parent8d89c0d92b3839eed0839b1a9bc7666e6261d972 (diff)
Fix the Stringer for leak mode
-rw-r--r--pkg/refs/refcounter.go6
-rw-r--r--runsc/boot/config.go2
-rw-r--r--runsc/main.go2
3 files changed, 6 insertions, 4 deletions
diff --git a/pkg/refs/refcounter.go b/pkg/refs/refcounter.go
index 417f4a2d6..7fe42d8ff 100644
--- a/pkg/refs/refcounter.go
+++ b/pkg/refs/refcounter.go
@@ -235,11 +235,11 @@ const (
func (l LeakMode) String() string {
switch l {
case NoLeakChecking:
- return "NoLeakChecking"
+ return "disabled"
case LeaksLogWarning:
- return "LeaksLogWarning"
+ return "warning"
case LeaksLogTraces:
- return "LeaksLogTraces"
+ return "traces"
default:
panic(fmt.Sprintf("Invalid leakmode: %d", l))
}
diff --git a/runsc/boot/config.go b/runsc/boot/config.go
index 4276a4cc4..3c0f72e9f 100644
--- a/runsc/boot/config.go
+++ b/runsc/boot/config.go
@@ -120,6 +120,8 @@ func MakeRefsLeakMode(s string) (refs.LeakMode, error) {
return refs.NoLeakChecking, nil
case "warning":
return refs.LeaksLogWarning, nil
+ case "traces":
+ return refs.LeaksLogTraces, nil
default:
return 0, fmt.Errorf("invalid refs leakmode %q", s)
}
diff --git a/runsc/main.go b/runsc/main.go
index 8857b96ac..1b7c1c4b7 100644
--- a/runsc/main.go
+++ b/runsc/main.go
@@ -73,7 +73,7 @@ var (
netRaw = flag.Bool("net-raw", false, "enable raw sockets. When false, raw sockets are disabled by removing CAP_NET_RAW from containers (`runsc exec` will still be able to utilize raw sockets). Raw sockets allow malicious containers to craft packets and potentially attack the network.")
numNetworkChannels = flag.Int("num-network-channels", 1, "number of underlying channels(FDs) to use for network link endpoints.")
rootless = flag.Bool("rootless", false, "it allows the sandbox to be started with a user that is not root. Sandbox and Gofer processes may run with same privileges as current user.")
- referenceLeakMode = flag.String("ref-leak-mode", "disabled", "sets reference leak check mode: disabled (default), warning.")
+ referenceLeakMode = flag.String("ref-leak-mode", "disabled", "sets reference leak check mode: disabled (default), warning, traces.")
// Test flags, not to be used outside tests, ever.
testOnlyAllowRunAsCurrentUserWithoutChroot = flag.Bool("TESTONLY-unsafe-nonroot", false, "TEST ONLY; do not ever use! This skips many security measures that isolate the host from the sandbox.")