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

Merge pull request #1237 from WeiZhang555/remove-hardcoded-str

Browse Source 
Replace hardcoded debug address with const var
This commit is contained in:
Phil Estes 2017-07-24 13:10:21 -04:00 committed by GitHub
commit 9b53b8b68d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/containerd/config_linux.go
View File

@ -12,7 +12,7 @@ func defaultConfig() *server.Config {
}, },
Debug: server.Debug{ Debug: server.Debug{
Level: "info", Level: "info",
Address: "/run/containerd/debug.sock", Address: server.DefaultDebugAddress,
}, },
} }
} }

4
cmd/containerd/config_unix.go → cmd/containerd/config_unsupported.go
View File

@ -1,4 +1,4 @@
// +build darwin freebsd // +build !linux,!windows
package main package main
@ -12,7 +12,7 @@ func defaultConfig() *server.Config {
}, },
Debug: server.Debug{ Debug: server.Debug{
Level: "info", Level: "info",
Address: "/run/containerd/debug.sock", Address: server.DefaultDebugAddress,
}, },
} }
} }

4
cmd/containerd/config_windows.go
View File

@ -11,11 +11,11 @@ func defaultConfig() *server.Config {
return &server.Config{ return &server.Config{
Root: filepath.Join(os.Getenv("programfiles"), "containerd", "root"), Root: filepath.Join(os.Getenv("programfiles"), "containerd", "root"),
GRPC: server.GRPCConfig{ GRPC: server.GRPCConfig{
Address: `\\.\pipe\containerd-containerd`, Address: server.DefaultAddress,
}, },
Debug: server.Debug{ Debug: server.Debug{
Level: "info", Level: "info",
Address: `\\.\pipe\containerd-debug`, Address: server.DefaultDebugAddress,
}, },
} }
} }