toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api/server fix golint errors/warnings.

Browse Source 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 351f6b8ec011983d894951769c2116c9feaf81d2
Component: engine
This commit is contained in:
root
2015-07-21 05:15:44 +00:00
committed by Srini Brahmaroutu
parent a011b8f810
commit dcda9483a8
9 changed files with 95 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/docker/daemon.go
View File

@ -211,7 +211,7 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {
cli.LogConfig.Config = make(map[string]string)
}
serverConfig := &apiserver.ServerConfig{
serverConfig := &apiserver.Config{
Logging: true,
Version: dockerversion.VERSION,
}
@ -236,7 +236,7 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {
// daemon doesn't exit
serveAPIWait := make(chan error)
go func() {
if err := api.ServeApi(commonFlags.Hosts); err != nil {
if err := api.ServeAPI(commonFlags.Hosts); err != nil {
logrus.Errorf("ServeAPI error: %v", err)
serveAPIWait <- err
return

2
components/engine/docker/daemon_unix.go
View File

@ -15,7 +15,7 @@ import (
_ "github.com/docker/docker/daemon/execdriver/native"
)
func setPlatformServerConfig(serverConfig *apiserver.ServerConfig, daemonCfg *daemon.Config) *apiserver.ServerConfig {
func setPlatformServerConfig(serverConfig *apiserver.Config, daemonCfg *daemon.Config) *apiserver.Config {
serverConfig.SocketGroup = daemonCfg.SocketGroup
serverConfig.EnableCors = daemonCfg.EnableCors
serverConfig.CorsHeaders = daemonCfg.CorsHeaders

2
components/engine/docker/daemon_windows.go
View File

@ -7,7 +7,7 @@ import (
"github.com/docker/docker/daemon"
)
func setPlatformServerConfig(serverConfig *apiserver.ServerConfig, daemonCfg *daemon.Config) *apiserver.ServerConfig {
func setPlatformServerConfig(serverConfig *apiserver.Config, daemonCfg *daemon.Config) *apiserver.Config {
return serverConfig
}