blackroad-os/backroad
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(stacks): use docker-compose-wrapper library (#4979)

Browse Source
This commit is contained in:
Chaim Lev-Ari
2021-07-21 04:56:28 +03:00
committed by GitHub
parent 592f7024e1
commit f9ffb1a712
11 changed files with 269 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/http/proxy/factory/docker_compose.go
View File

@@ -49,13 +49,18 @@ func (factory *ProxyFactory) NewDockerComposeAgentProxy(endpoint *portainer.Endp
proxy.Transport = dockercompose.NewAgentTransport(factory.signatureService, httpTransport)
proxyServer := &ProxyServer{
&http.Server{
server: &http.Server{
Handler: proxy,
},
0,
Port: 0,
}
return proxyServer, proxyServer.start()
err = proxyServer.start()
if err != nil {
return nil, err
}
return proxyServer, err
}
func (proxy *ProxyServer) start() error {
@@ -72,7 +77,7 @@ func (proxy *ProxyServer) start() error {
err := proxy.server.Serve(listener)
log.Printf("Exiting Proxy server %s\n", proxyHost)
if err != http.ErrServerClosed {
if err != nil && err != http.ErrServerClosed {
log.Printf("Proxy server %s exited with an error: %s\n", proxyHost, err)
}
}()