Merge pull request #2081 from crosbymichael/debug

Allow tcp debug address

cmd/containerd/config_linux.go

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

cmd/containerd/config_windows.go

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

cmd/containerd/main.go

@@ -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)
+			var l net.Listener
-			if err != nil {
+			if filepath.IsAbs(config.Debug.Address) {
-				return errors.Wrapf(err, "failed to get listener for debug endpoint")
+				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)
 		}