Raise exception when sending a renerated key fails

We still need to figure out what to do when the upload fails. But we're
already raising the exception, so we can track it on the logs

See: https://github.com/pixelated/pixelated-user-agent/issues/815

1 files changed, 9 insertions, 4 deletions

diff --git a/service/pixelated/bitmask_libraries/keymanager.py b/service/pixelated/bitmask_libraries/keymanager.py
index 59f9f62f..84e3f6aa 100644
--- a/service/pixelated/bitmask_libraries/keymanager.py
+++ b/service/pixelated/bitmask_libraries/keymanager.py
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-import datetime
+
 from twisted.internet import defer
 from twisted.logger import Logger
 
@@ -50,12 +50,17 @@ class Keymanager(object):
         if not current_key:
             yield self._generate_key_and_send_to_leap()
         elif current_key.needs_renewal(DEFAULT_EXTENSION_THRESHOLD):
-            yield self._regenerate_key()
-            yield self._send_key_to_leap()
+            yield self._regenerate_key_and_send_to_leap()
 
     @defer.inlineCallbacks
-    def _regenerate_key(self):
+    def _regenerate_key_and_send_to_leap(self):
+        logger.info("Regenerating keys - this could take a while...")
         yield self.keymanager.regenerate_key()
+        try:
+            yield self._send_key_to_leap()
+        except Exception as e:
+            # what to be done when upload key error
+            raise UploadKeyError(e.message)
 
     @defer.inlineCallbacks
     def _generate_key_and_send_to_leap(self):