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

packer/plugin: Set killed in the kill clients method

This commit is contained in:
Mitchell Hashimoto 2013-08-19 23:39:14 -07:00
parent f68e00085b
commit cfa9cef2bf
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packer/plugin/client.go
View File

@ -73,6 +73,9 @@ type ClientConfig struct {
// //
// This must only be called _once_. // This must only be called _once_.
func CleanupClients() { func CleanupClients() {
// Set the killed to true so that we don't get unexpected panics
Killed = true
// Kill all the managed clients in parallel and use a WaitGroup // Kill all the managed clients in parallel and use a WaitGroup
// to wait for them all to finish up. // to wait for them all to finish up.
var wg sync.WaitGroup var wg sync.WaitGroup

1
signal.go
View File

@ -28,7 +28,6 @@ func setupSignalHandlers(env packer.Environment) {
// Force kill all the plugins, but mark that we're killing them // Force kill all the plugins, but mark that we're killing them
// first so that we don't get panics everywhere. // first so that we don't get panics everywhere.
plugin.Killed = true
plugin.CleanupClients() plugin.CleanupClients()
os.Exit(1) os.Exit(1)
}() }()