Skip to content

Commit 264331a

Browse files
csweichelroboquat
authored andcommitted
[nsenter] Move nsenter to common-go
1 parent 19d9bfd commit 264331a

File tree

7 files changed

+1
-4
lines changed

7 files changed

+1
-4
lines changed

components/ws-daemon/nsinsider/pkg/nsenter/utils.go renamed to components/common-go/nsenter/utils.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import (
1515

1616
"golang.org/x/sys/unix"
1717
"golang.org/x/xerrors"
18-
19-
"github.com/gitpod-io/gitpod/common-go/log"
2018
)
2119

2220
type Namespace int
@@ -75,7 +73,6 @@ func Run(pid int, args []string, addFD []*os.File, enterNamespace ...Namespace)
7573
cmd.ExtraFiles = append(cmd.ExtraFiles, f)
7674
}
7775

78-
log.WithField("env", cmd.Env).WithField("extraFiles", len(cmd.ExtraFiles)).WithField("args", args).WithField("pid", pid).Debug("calling handler")
7976
cmd.Stdout = os.Stdout
8077
cmd.Stderr = os.Stderr
8178
err := cmd.Run()

components/ws-daemon/nsinsider/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"golang.org/x/xerrors"
1818

1919
"github.com/gitpod-io/gitpod/common-go/log"
20-
_ "github.com/gitpod-io/gitpod/ws-daemon/nsinsider/pkg/nsenter"
20+
_ "github.com/gitpod-io/gitpod/common-go/nsenter"
2121
)
2222

2323
func main() {

0 commit comments

Comments
 (0)