Browse Source

Removed race condition
If two interrupts were fired really quickly interruptCount could have been incremented twice before the LoadUint32 making cleanup not being called at all.

Signed-off-by: Erik Dubbelboer <erik@dubbelboer.com>

Erik Dubbelboer 10 years ago
parent
commit
46b1194d99
1 changed files with 1 additions and 2 deletions
  1. 1 2
      pkg/signal/trap.go

+ 1 - 2
pkg/signal/trap.go

@@ -34,9 +34,8 @@ func Trap(cleanup func()) {
 				case os.Interrupt, syscall.SIGTERM:
 					// If the user really wants to interrupt, let him do so.
 					if atomic.LoadUint32(&interruptCount) < 3 {
-						atomic.AddUint32(&interruptCount, 1)
 						// Initiate the cleanup only once
-						if atomic.LoadUint32(&interruptCount) == 1 {
+						if atomic.AddUint32(&interruptCount, 1) == 1 {
 							// Call cleanup handler
 							cleanup()
 							os.Exit(0)