Browse Source

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

Solomon Hykes 11 years ago
parent
commit
02ddaad5d9
2 changed files with 5 additions and 2 deletions
  1. 3 1
      docker/docker.go
  2. 2 1
      server.go

+ 3 - 1
docker/docker.go

@@ -86,7 +86,9 @@ func main() {
 			log.Fatal(err)
 		}
 		// 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)
 		}
 	} else {

+ 2 - 1
server.go

@@ -88,7 +88,8 @@ func (srv *Server) ListenAndServe(job *engine.Job) string {
 			return "Invalid protocol format."
 		}
 		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 {