From ed4473c849cc3e9029dc7894ade716d791c918c6 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 1 Mar 2016 16:39:43 -0500
Subject: [PATCH] Fix signal handling with pyinstaller.

Raise a ShutdownException instead of a KeyboardInterupt when a thread.error
is caught. This thread.error is only raised when run from a pyinstaller
binary (for reasons unknown).

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 compose/cli/main.py        |  2 +-
 compose/cli/multiplexer.py |  3 ++-
 compose/parallel.py        | 36 +++++++++++++++++++++++-------------
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 2c0fda1cf..0a917720f 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -54,7 +54,7 @@ def main():
     try:
         command = TopLevelCommand()
         command.sys_dispatch()
-    except KeyboardInterrupt:
+    except (KeyboardInterrupt, signals.ShutdownException):
         log.error("Aborting.")
         sys.exit(1)
     except (UserError, NoSuchService, ConfigurationError) as e:
diff --git a/compose/cli/multiplexer.py b/compose/cli/multiplexer.py
index e6e63f24b..ae8aa5916 100644
--- a/compose/cli/multiplexer.py
+++ b/compose/cli/multiplexer.py
@@ -10,6 +10,7 @@ try:
 except ImportError:
     from queue import Queue, Empty  # Python 3.x
 
+from compose.cli.signals import ShutdownException
 
 STOP = object()
 
@@ -47,7 +48,7 @@ class Multiplexer(object):
                 pass
             # See https://github.com/docker/compose/issues/189
             except thread.error:
-                raise KeyboardInterrupt()
+                raise ShutdownException()
 
     def _init_readers(self):
         for iterator in self.iterators:
diff --git a/compose/parallel.py b/compose/parallel.py
index b8415e5e5..4810a1064 100644
--- a/compose/parallel.py
+++ b/compose/parallel.py
@@ -6,9 +6,11 @@ import sys
 from threading import Thread
 
 from docker.errors import APIError
+from six.moves import _thread as thread
 from six.moves.queue import Empty
 from six.moves.queue import Queue
 
+from compose.cli.signals import ShutdownException
 from compose.utils import get_output_stream
 
 
@@ -26,19 +28,7 @@ def parallel_execute(objects, func, index_func, msg):
     objects = list(objects)
     stream = get_output_stream(sys.stderr)
     writer = ParallelStreamWriter(stream, msg)
-
-    for obj in objects:
-        writer.initialize(index_func(obj))
-
-    q = Queue()
-
-    # TODO: limit the number of threads #1828
-    for obj in objects:
-        t = Thread(
-            target=perform_operation,
-            args=(func, obj, q.put, index_func(obj)))
-        t.daemon = True
-        t.start()
+    q = setup_queue(writer, objects, func, index_func)
 
     done = 0
     errors = {}
@@ -48,6 +38,9 @@ def parallel_execute(objects, func, index_func, msg):
             msg_index, result = q.get(timeout=1)
         except Empty:
             continue
+        # See https://github.com/docker/compose/issues/189
+        except thread.error:
+            raise ShutdownException()
 
         if isinstance(result, APIError):
             errors[msg_index] = "error", result.explanation
@@ -68,6 +61,23 @@ def parallel_execute(objects, func, index_func, msg):
             raise error
 
 
+def setup_queue(writer, objects, func, index_func):
+    for obj in objects:
+        writer.initialize(index_func(obj))
+
+    q = Queue()
+
+    # TODO: limit the number of threads #1828
+    for obj in objects:
+        t = Thread(
+            target=perform_operation,
+            args=(func, obj, q.put, index_func(obj)))
+        t.daemon = True
+        t.start()
+
+    return q
+
+
 class ParallelStreamWriter(object):
     """Write out messages for operations happening in parallel.