packer/plugin: use chan struct{} for condition variable behavior

This commit is contained in:
Mitchell Hashimoto 2013-07-30 10:43:43 -07:00
parent 0dd4a4d83f
commit 69a5e83f47
1 changed files with 5 additions and 12 deletions

View File

@ -28,7 +28,7 @@ var managedClients = make([]*Client, 0, 5)
type Client struct {
config *ClientConfig
exited bool
doneLogging bool
doneLogging chan struct{}
l sync.Mutex
address string
}
@ -188,16 +188,7 @@ func (c *Client) Kill() {
cmd.Process.Kill()
// Wait for the client to finish logging so we have a complete log
done := make(chan bool)
go func() {
for !c.doneLogging {
time.Sleep(10 * time.Millisecond)
}
done <- true
}()
<-done
<-c.doneLogging
}
// Starts the underlying subprocess, communicating with it to negotiate
@ -214,6 +205,8 @@ func (c *Client) Start() (address string, err error) {
return c.address, nil
}
c.doneLogging = make(chan struct{})
env := []string{
fmt.Sprintf("%s=%s", MagicCookieKey, MagicCookieValue),
fmt.Sprintf("PACKER_PLUGIN_MIN_PORT=%d", c.config.MinPort),
@ -314,7 +307,7 @@ func (c *Client) logStderr(r io.Reader) {
}
// Flag that we've completed logging for others
c.doneLogging = true
close(c.doneLogging)
}
func (c *Client) rpcClient() (*rpc.Client, error) {