From ded1a7c7550320a9f321c80e56891bcc75fc2da1 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Fri, 25 Aug 2017 12:04:22 -0400
Subject: [refactor] change status to "failed"

---
 src/leap/bitmask/cli/command.py        | 2 +-
 src/leap/bitmask/core/mail_services.py | 6 +++---
 src/leap/bitmask/util.py               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/leap/bitmask/cli/command.py b/src/leap/bitmask/cli/command.py
index 76ac1f25..72d1ebcf 100644
--- a/src/leap/bitmask/cli/command.py
+++ b/src/leap/bitmask/cli/command.py
@@ -75,7 +75,7 @@ def print_status(status, depth=0):
         line = Fore.RESET + name.ljust(12)
         if v['status'] in ('on', 'starting'):
             line += Fore.GREEN
-        elif v['status'] == 'failure':
+        elif v['status'] == 'failed':
             line += Fore.RED
         line += v['status']
         if v.get('error'):
diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py
index f159ca14..4a5f9798 100644
--- a/src/leap/bitmask/core/mail_services.py
+++ b/src/leap/bitmask/core/mail_services.py
@@ -282,7 +282,7 @@ class KeymanagerContainer(Container):
         def _log_key_error(failure):
             self.log.failure('Error while generating key!')
             error = "Error generating key: %s" % failure.getErrorMessage()
-            self._set_status(userid, "failure", error=error)
+            self._set_status(userid, "failed", error=error)
             return failure
 
         self.log.info('Looking up private key for %s' % userid)
@@ -831,8 +831,8 @@ class IncomingMailService(service.MultiService):
         return d
 
     def _errback(self, failure, userid):
-        self._set_status(userid, "failure", error=str(failure))
-        self.log.failure('failure!')
+        self._set_status(userid, "failed", error=str(failure))
+        self.log.failure('failed!')
 
 # --------------------------------------------------------------------
 #
diff --git a/src/leap/bitmask/util.py b/src/leap/bitmask/util.py
index b070d9a8..6971ca0a 100644
--- a/src/leap/bitmask/util.py
+++ b/src/leap/bitmask/util.py
@@ -54,7 +54,7 @@ def merge_status(children):
             "off": 1,
             "starting": 10,
             "stopping": 11,
-            "failure": 100
+            "failed": 100
         }
         return level.get(status["status"], -1)
 
-- 
cgit v1.2.3