Better log for cancelled build

bosondata · Jun 16, 2017 · a50c39e · a50c39e
1 parent 0ccb85a
commit a50c39e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/badwolf/builder.py b/badwolf/builder.py
@@ -238,7 +238,12 @@ def run_in_container(self, docker_image_name):
                 container.remove(force=True)
             except NotFound:
                 pass
-            except (APIError, DockerException, ReadTimeout):
+            except APIError as api_e:
+                if 'can not get logs from container which is dead or marked for removal' in str(api_e):
+                    output.append('Build cancelled')
+                else:
+                    logger.exception('Error removing docker container')
+            except (DockerException, ReadTimeout):
                 logger.exception('Error removing docker container')
 
         return exit_code, ''.join(output)