iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builder/vmware: Don't start HTTP server if we specified no files

This commit is contained in:
Mitchell Hashimoto 2013-06-06 14:42:23 -07:00
parent 1a5c9d300f
commit 057d656eda
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
builder/vmware/step_http_server.go
View File

@ -25,24 +25,27 @@ func (s *stepHTTPServer) Run(state map[string]interface{}) multistep.StepAction
config := state["config"].(*config)
ui := state["ui"].(packer.Ui)
httpPort := 8080
httpAddr := fmt.Sprintf(":%d", httpPort)
httpPort := 0
if config.HTTPDir != "" {
httpPort = 8080
httpAddr := fmt.Sprintf(":%d", httpPort)
ui.Say(fmt.Sprintf("Starting HTTP server on port %d", httpPort))
ui.Say(fmt.Sprintf("Starting HTTP server on port %d", httpPort))
// Start the TCP listener
var err error
s.l, err = net.Listen("tcp", httpAddr)
if err != nil {
ui.Error(fmt.Sprintf("Error starting HTTP server: %s", err))
return multistep.ActionHalt
// Start the TCP listener
var err error
s.l, err = net.Listen("tcp", httpAddr)
if err != nil {
ui.Error(fmt.Sprintf("Error starting HTTP server: %s", err))
return multistep.ActionHalt
}
// Start the HTTP server and run it in the background
fileServer := http.FileServer(http.Dir(config.HTTPDir))
server := &http.Server{Addr: httpAddr, Handler: fileServer}
go server.Serve(s.l)
}
// Start the HTTP server and run it in the background
fileServer := http.FileServer(http.Dir(config.HTTPDir))
server := &http.Server{Addr: httpAddr, Handler: fileServer}
go server.Serve(s.l)
// Save the address into the state so it can be accessed in the future
state["http_port"] = httpPort