catch all exceptions during POOL_UPGRADE dyn vaidation

Signed-off-by: Andrey Kononykhin <[email protected]>
SylvainMartel · Mar 15, 2019 · 1cea29b · 1cea29b
1 parent b6b453d
commit 1cea29b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/indy_node/server/config_req_handler.py b/indy_node/server/config_req_handler.py
@@ -113,7 +113,11 @@ def validate(self, req: Request):
             if not pkg_to_upgrade:
                 raise InvalidClientRequest(req.identifier, req.reqId, "Upgrade package name is empty")
 
-            res = self.upgrader.check_upgrade_possible(pkg_to_upgrade, targetVersion, reinstall)
+            try:
+                res = self.upgrader.check_upgrade_possible(pkg_to_upgrade, targetVersion, reinstall)
+            except Exception as exc:
+                res = str(exc)
+
             if res:
                 raise InvalidClientRequest(req.identifier, req.reqId, res)
 

diff --git a/indy_node/server/request_handlers/config_req_handlers/pool_upgrade_handler.py b/indy_node/server/request_handlers/config_req_handlers/pool_upgrade_handler.py
@@ -58,7 +58,11 @@ def dynamic_validation(self, request: Request):
         if not pkg_to_upgrade:
             raise InvalidClientRequest(identifier, req_id, "Upgrade package name is empty")
 
-        res = self.upgrader.check_upgrade_possible(pkg_to_upgrade, targetVersion, reinstall)
+        try:
+            res = self.upgrader.check_upgrade_possible(pkg_to_upgrade, targetVersion, reinstall)
+        except Exception as exc:
+            res = str(exc)
+
         if res:
             raise InvalidClientRequest(identifier, req_id, res)