github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2081 from crosbymichael/debug

Browse Source 
Allow tcp debug address
This commit is contained in:
Phil Estes 2018-02-01 08:15:09 +00:00 committed by GitHub
commit 34e24997b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/containerd/config_linux.go
View File

@ -12,9 +12,5 @@ func defaultConfig() *server.Config {
GRPC: server.GRPCConfig{
Address: defaults.DefaultAddress,
},
Debug: server.Debug{
Level: "info",
Address: defaults.DefaultDebugAddress,
},
}
}

4
cmd/containerd/config_windows.go
View File

@ -12,9 +12,5 @@ func defaultConfig() *server.Config {
GRPC: server.GRPCConfig{
Address: defaults.DefaultAddress,
},
Debug: server.Debug{
Level: "info",
Address: defaults.DefaultDebugAddress,
},
}
}

13
cmd/containerd/main.go
View File

@ -8,6 +8,7 @@ import (
"net"
"os"
"os/signal"
"path/filepath"
"time"
"github.com/containerd/containerd/log"
@ -108,9 +109,15 @@ func main() {
}
serverC <- server
if config.Debug.Address != "" {
l, err := sys.GetLocalListener(config.Debug.Address, config.Debug.UID, config.Debug.GID)
if err != nil {
return errors.Wrapf(err, "failed to get listener for debug endpoint")
var l net.Listener
if filepath.IsAbs(config.Debug.Address) {
if l, err = sys.GetLocalListener(config.Debug.Address, config.Debug.UID, config.Debug.GID); err != nil {
return errors.Wrapf(err, "failed to get listener for debug endpoint")
}
} else {
if l, err = net.Listen("tcp", config.Debug.Address); err != nil {
return errors.Wrapf(err, "failed to get listener for debug endpoint")
}
}
serve(ctx, l, server.ServeDebug)
}