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

packer/plugin: Count number of interrupts atomically

This commit is contained in:
Mitchell Hashimoto 2013-08-30 16:29:21 -07:00
parent 65eb05384f
commit a03c66272f
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packer/plugin/plugin.go
View File

@ -19,8 +19,14 @@ import (
"os/signal" "os/signal"
"runtime" "runtime"
"strconv" "strconv"
"sync/atomic"
) )
// This is a count of the number of interrupts the process has received.
// This is updated with sync/atomic whenever a SIGINT is received and can
// be checked by the plugin safely to take action.
var Interrupts int32 = 0
const MagicCookieKey = "PACKER_PLUGIN_MAGIC_COOKIE" const MagicCookieKey = "PACKER_PLUGIN_MAGIC_COOKIE"
const MagicCookieValue = "d602bf8f470bc67ca7faa0386276bbdd4330efaf76d1a219cb4d6991ca9872b2" const MagicCookieValue = "d602bf8f470bc67ca7faa0386276bbdd4330efaf76d1a219cb4d6991ca9872b2"
@ -86,17 +92,18 @@ func serve(server *rpc.Server) (err error) {
return return
} }
// Registers a signal handler to "swallow" interrupts so that the // Registers a signal handler to swallow and count interrupts so that the
// plugin isn't killed. The main host Packer process is responsible // plugin isn't killed. The main host Packer process is responsible
// for killing the plugins when interrupted. // for killing the plugins when interrupted.
func swallowInterrupts() { func countInterrupts() {
ch := make(chan os.Signal, 1) ch := make(chan os.Signal, 1)
signal.Notify(ch, os.Interrupt) signal.Notify(ch, os.Interrupt)
go func() { go func() {
for { for {
<-ch <-ch
log.Println("Received interrupt signal. Ignoring.") newCount := atomic.AddInt32(&Interrupts, 1)
log.Printf("Received interrupt signal (count: %d). Ignoring.", newCount)
} }
}() }()
} }
@ -108,7 +115,7 @@ func ServeBuilder(builder packer.Builder) {
server := rpc.NewServer() server := rpc.NewServer()
packrpc.RegisterBuilder(server, builder) packrpc.RegisterBuilder(server, builder)
swallowInterrupts() countInterrupts()
if err := serve(server); err != nil { if err := serve(server); err != nil {
log.Printf("ERROR: %s", err) log.Printf("ERROR: %s", err)
os.Exit(1) os.Exit(1)
@ -122,7 +129,7 @@ func ServeCommand(command packer.Command) {
server := rpc.NewServer() server := rpc.NewServer()
packrpc.RegisterCommand(server, command) packrpc.RegisterCommand(server, command)
swallowInterrupts() countInterrupts()
if err := serve(server); err != nil { if err := serve(server); err != nil {
log.Printf("ERROR: %s", err) log.Printf("ERROR: %s", err)
os.Exit(1) os.Exit(1)
@ -136,7 +143,7 @@ func ServeHook(hook packer.Hook) {
server := rpc.NewServer() server := rpc.NewServer()
packrpc.RegisterHook(server, hook) packrpc.RegisterHook(server, hook)
swallowInterrupts() countInterrupts()
if err := serve(server); err != nil { if err := serve(server); err != nil {
log.Printf("ERROR: %s", err) log.Printf("ERROR: %s", err)
os.Exit(1) os.Exit(1)
@ -150,7 +157,7 @@ func ServePostProcessor(p packer.PostProcessor) {
server := rpc.NewServer() server := rpc.NewServer()
packrpc.RegisterPostProcessor(server, p) packrpc.RegisterPostProcessor(server, p)
swallowInterrupts() countInterrupts()
if err := serve(server); err != nil { if err := serve(server); err != nil {
log.Printf("ERROR: %s", err) log.Printf("ERROR: %s", err)
os.Exit(1) os.Exit(1)
@ -164,7 +171,7 @@ func ServeProvisioner(p packer.Provisioner) {
server := rpc.NewServer() server := rpc.NewServer()
packrpc.RegisterProvisioner(server, p) packrpc.RegisterProvisioner(server, p)
swallowInterrupts() countInterrupts()
if err := serve(server); err != nil { if err := serve(server); err != nil {
log.Printf("ERROR: %s", err) log.Printf("ERROR: %s", err)
os.Exit(1) os.Exit(1)