clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-21 13:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Engine: optional environment variable 'Logging' in 'serveapi'

Browse Source
This commit is contained in:
Solomon Hykes
2013-10-27 07:06:43 +00:00
parent 4e7cb37dcc
commit 02ddaad5d9
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/docker.go
+3 -1
View File
@@ -86,7 +86,9 @@ func main() {
log.Fatal(err) log.Fatal(err)
} }
// Serve api // Serve api
if err := eng.Job("serveapi", flHosts...).Run(); err != nil { job := eng.Job("serveapi", flHosts...)
job.Setenv("Logging", true)
if err := job.Run(); err != nil {
log.Fatal(err) log.Fatal(err)
} }
} else { } else {
server.go
+2 -1
View File
@@ -88,7 +88,8 @@ func (srv *Server) ListenAndServe(job *engine.Job) string {
return "Invalid protocol format." return "Invalid protocol format."
} }
go func() { go func() {
chErrors <- ListenAndServe(protoAddrParts[0], protoAddrParts[1], srv, true) // FIXME: merge Server.ListenAndServe with ListenAndServe
chErrors <- ListenAndServe(protoAddrParts[0], protoAddrParts[1], srv, job.GetenvBool("Logging"))
}() }()
} }
for i := 0; i < len(protoAddrs); i += 1 { for i := 0; i < len(protoAddrs); i += 1 {