From 293102094bab00f15bdba90e230f010d18704a89 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Thu, 11 May 2017 18:55:40 +0200 Subject: [bug] return core status as json instead of string - Resolves: #8886 --- src/leap/bitmask/cli/bitmask_cli.py | 3 +-- src/leap/bitmask/core/service.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/leap/bitmask') diff --git a/src/leap/bitmask/cli/bitmask_cli.py b/src/leap/bitmask/cli/bitmask_cli.py index 247b6dc7..b418f1af 100755 --- a/src/leap/bitmask/cli/bitmask_cli.py +++ b/src/leap/bitmask/cli/bitmask_cli.py @@ -117,8 +117,7 @@ OPTIONAL ARGUMENTS: return self._send(printer=self._print_status) def _print_status(self, status): - statusdict = json.loads(status) - for key, value in statusdict.items(): + for key, value in status.items(): color = Fore.GREEN if value == 'stopped': color = Fore.RED diff --git a/src/leap/bitmask/core/service.py b/src/leap/bitmask/core/service.py index cb520867..310ac08e 100644 --- a/src/leap/bitmask/core/service.py +++ b/src/leap/bitmask/core/service.py @@ -301,7 +301,7 @@ class BackendCommands(object): status[name] = _status status['backend'] = flags.BACKEND - return json.dumps(status) + return status def do_version(self): return {'version_core': __version__} -- cgit v1.2.3