factor out failed to start situation

buildbot · Mar 24, 2015 · 393611d · 393611d
1 parent 52435df
commit 393611d
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/master/buildbot/buildslave/ec2.py b/master/buildbot/buildslave/ec2.py
@@ -279,6 +279,13 @@ def start_instance(self, build):
         else:
             return threads.deferToThread(self._start_instance)
 
+    def _failed_to_start(self):
+        log.msg('%s %s failed to start instance %s (%s)' %
+                (self.__class__.__name__, self.slavename,
+                    self.instance.id, self.instance.state))
+        raise interfaces.LatentBuildSlaveFailedToSubstantiate(
+            self.instance.id, self.instance.state)
+
     def _start_instance(self):
         image = self.get_image()
         reservation = image.run(
@@ -293,11 +300,7 @@ def _start_instance(self):
                 self.conn.create_tags(instance_id, self.tags)
             return [instance_id, image_id, start_time]
         else:
-            log.msg('%s %s failed to start instance %s (%s)' %
-                    (self.__class__.__name__, self.slavename,
-                     self.instance.id, self.instance.state))
-            raise interfaces.LatentBuildSlaveFailedToSubstantiate(
-                self.instance.id, self.instance.state)
+            self._failed_to_start()
 
     def stop_instance(self, fast=False):
         if self.instance is None:
@@ -442,11 +445,7 @@ def _wait_for_instance(self, image):
                 self._attach_volumes()
             return self.instance.id, image.id, start_time
         else:
-            log.msg('%s %s failed to start instance %s (%s)' %
-                    (self.__class__.__name__, self.slavename,
-                     self.instance.id, self.instance.state))
-            raise interfaces.LatentBuildSlaveFailedToSubstantiate(
-                self.instance.id, self.instance.state)
+            self._failed_to_start()
 
     def _wait_for_request(self, reservation):
         duration = 0