Merge pull request #436 from helgi/kubehttpexceptions

ref(scheduler): spin off response info in KubeException into KubeHTTPException

Author: helgi

rootfs/api/models/app.py

@@ -18,7 +18,7 @@
 from api.models.container import Container
 from api.models.domain import Domain
 
-from scheduler import KubeException
+from scheduler import KubeHTTPException, KubeException
 
 logger = logging.getLogger(__name__)
 
@@ -551,7 +551,7 @@ def list_pods(self, *args, **kwargs):
             data.sort(key=lambda x: x['started'], reverse=True)
 
             return data
-        except KubeException as e:
+        except KubeHTTPException as e:
             pass
         except Exception as e:
             err = '(list pods): {}'.format(e)

rootfs/scheduler/__init__.py

@@ -264,14 +264,25 @@
 
 class KubeException(Exception):
     def __init__(self, *args, **kwargs):
-        self.response = kwargs.pop('response', object)
         Exception.__init__(self, *args, **kwargs)
 
 
-def error(resp, errmsg, *args):
+class KubeHTTPException(KubeException):
+    def __init__(self, *args, **kwargs):
+        self.response = kwargs.pop('response', object)
+        KubeException.__init__(self, *args, **kwargs)
+
+
+def error(response, errmsg, *args):
     errmsg = errmsg.format(*args)
-    errmsg = "failed to {}: {} {}\n{}".format(errmsg, resp.status_code, resp.reason, resp.json())
-    raise KubeException(errmsg, response=resp)
+    errmsg = "failed to {}: {} {}\n{}".format(
+        errmsg,
+        response.status_code,
+        response.reason,
+        response.json()
+    )
+
+    raise KubeHTTPException(errmsg, response=response)
 
 
 def unhealthy(status_code):
@@ -1082,7 +1093,7 @@ def _delete_pod(self, name, namespace):
         for _ in range(30):
             try:
                 self._get_pod(name, namespace)
-            except KubeException as e:
+            except KubeHTTPException as e:
                 if e.response.status_code == 404:
                     break
 
@@ -1091,7 +1102,7 @@ def _delete_pod(self, name, namespace):
         # Pod was not deleted within the grace period.
         try:
             self._get_pod(name, namespace)
-        except KubeException as e:
+        except KubeHTTPException as e:
             if e.response.status_code != 404:
                 error(e.response, 'delete Pod "{}" in Namespace "{}"', name, namespace)