From adeec483a344b01d64ed9625434056279df2cace Mon Sep 17 00:00:00 2001 From: Zhang Wei Date: Mon, 24 Jul 2017 23:41:39 +0800 Subject: [PATCH] Replace hardcoded debug address with const var Debug address in defaultConfig() doesn't have to be a hardcoded string, instead it can be const var from package server, which is also a platform dependent const. So it would be better to use server.DefaultDebugAddress here. Signed-off-by: Zhang Wei --- cmd/containerd/config_linux.go | 2 +- cmd/containerd/{config_unix.go => config_unsupported.go} | 4 ++-- cmd/containerd/config_windows.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename cmd/containerd/{config_unix.go => config_unsupported.go} (80%) diff --git a/cmd/containerd/config_linux.go b/cmd/containerd/config_linux.go index ff2138909..538c37bf9 100644 --- a/cmd/containerd/config_linux.go +++ b/cmd/containerd/config_linux.go @@ -12,7 +12,7 @@ func defaultConfig() *server.Config { }, Debug: server.Debug{ Level: "info", - Address: "/run/containerd/debug.sock", + Address: server.DefaultDebugAddress, }, } } diff --git a/cmd/containerd/config_unix.go b/cmd/containerd/config_unsupported.go similarity index 80% rename from cmd/containerd/config_unix.go rename to cmd/containerd/config_unsupported.go index 7d1263a4c..6a7478f44 100644 --- a/cmd/containerd/config_unix.go +++ b/cmd/containerd/config_unsupported.go @@ -1,4 +1,4 @@ -// +build darwin freebsd +// +build !linux,!windows package main @@ -12,7 +12,7 @@ func defaultConfig() *server.Config { }, Debug: server.Debug{ Level: "info", - Address: "/run/containerd/debug.sock", + Address: server.DefaultDebugAddress, }, } } diff --git a/cmd/containerd/config_windows.go b/cmd/containerd/config_windows.go index 628dd90f2..20194221f 100644 --- a/cmd/containerd/config_windows.go +++ b/cmd/containerd/config_windows.go @@ -11,11 +11,11 @@ func defaultConfig() *server.Config { return &server.Config{ Root: filepath.Join(os.Getenv("programfiles"), "containerd", "root"), GRPC: server.GRPCConfig{ - Address: `\\.\pipe\containerd-containerd`, + Address: server.DefaultAddress, }, Debug: server.Debug{ Level: "info", - Address: `\\.\pipe\containerd-debug`, + Address: server.DefaultDebugAddress, }, } }