mirror of
https://github.com/clearlinux/docker.git
synced 2026-08-26 09:36:04 +00:00
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>
This commit is contained in:
+1
-2
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user