Commit 05ba6674 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson

Address nits from self-review

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com> (cherry picked from commit 9ff0943d) Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent de0c68f2
...@@ -6,6 +6,7 @@ package rootless ...@@ -6,6 +6,7 @@ package rootless
import ( import (
"io" "io"
"path" "path"
"strings"
"github.com/rootless-containers/rootlesskit/pkg/port" "github.com/rootless-containers/rootlesskit/pkg/port"
portbuiltin "github.com/rootless-containers/rootlesskit/pkg/port/builtin" portbuiltin "github.com/rootless-containers/rootlesskit/pkg/port/builtin"
...@@ -13,6 +14,15 @@ import ( ...@@ -13,6 +14,15 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
type logrusDebugWriter struct {
}
func (w *logrusDebugWriter) Write(p []byte) (int, error) {
s := strings.TrimSuffix(string(p), "\n")
logrus.Debug(s)
return len(p), nil
}
type portDriver interface { type portDriver interface {
NewParentDriver() (port.ParentDriver, error) NewParentDriver() (port.ParentDriver, error)
NewChildDriver() port.ChildDriver NewChildDriver() port.ChildDriver
...@@ -74,7 +84,9 @@ func (s *slirp4netnsDriver) APISocketPath() string { ...@@ -74,7 +84,9 @@ func (s *slirp4netnsDriver) APISocketPath() string {
return "" return ""
} }
func getDriver(driverName string, logWriter io.Writer) portDriver { func getDriver(driverName string) portDriver {
logWriter := &logrusDebugWriter{}
if driverName == "slirp4netns" { if driverName == "slirp4netns" {
return &slirp4netnsDriver{logWriter: logWriter} return &slirp4netnsDriver{logWriter: logWriter}
} }
......
...@@ -42,9 +42,8 @@ func Rootless(stateDir string, enableIPv6 bool) error { ...@@ -42,9 +42,8 @@ func Rootless(stateDir string, enableIPv6 bool) error {
hasFD := os.Getenv(pipeFD) != "" hasFD := os.Getenv(pipeFD) != ""
hasChildEnv := os.Getenv(childEnv) != "" hasChildEnv := os.Getenv(childEnv) != ""
driverName := strings.ToLower(os.Getenv(portDriverEnv))
rootlessDir := filepath.Join(stateDir, "rootless") rootlessDir := filepath.Join(stateDir, "rootless")
driver := getDriver(driverName, &logrusDebugWriter{}) driver := getDriver(strings.ToLower(os.Getenv(portDriverEnv)))
if hasFD { if hasFD {
logrus.Debug("Running rootless child") logrus.Debug("Running rootless child")
...@@ -166,7 +165,7 @@ func createParentOpt(driver portDriver, stateDir string, enableIPv6 bool) (*pare ...@@ -166,7 +165,7 @@ func createParentOpt(driver portDriver, stateDir string, enableIPv6 bool) (*pare
mtu := 0 mtu := 0
if val := os.Getenv(mtuEnv); val != "" { if val := os.Getenv(mtuEnv); val != "" {
if v, err := strconv.ParseInt(val, 10, 0); err != nil { if v, err := strconv.ParseInt(val, 10, 0); err != nil {
logrus.Warn("Failed to parse rootless mtu; using default") logrus.Warn("Failed to parse rootless mtu value; using default")
} else { } else {
mtu = int(v) mtu = int(v)
} }
...@@ -217,15 +216,6 @@ func createParentOpt(driver portDriver, stateDir string, enableIPv6 bool) (*pare ...@@ -217,15 +216,6 @@ func createParentOpt(driver portDriver, stateDir string, enableIPv6 bool) (*pare
return opt, nil return opt, nil
} }
type logrusDebugWriter struct {
}
func (w *logrusDebugWriter) Write(p []byte) (int, error) {
s := strings.TrimSuffix(string(p), "\n")
logrus.Debug(s)
return len(p), nil
}
func createChildOpt(driver portDriver) (*child.Opt, error) { func createChildOpt(driver portDriver) (*child.Opt, error) {
opt := &child.Opt{} opt := &child.Opt{}
opt.TargetCmd = os.Args opt.TargetCmd = os.Args
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment