diff options
author | Kali Kaneko (leap communications) <kali@leap.se> | 2016-09-26 16:53:42 -0400 |
---|---|---|
committer | Kali Kaneko (leap communications) <kali@leap.se> | 2016-09-26 16:53:42 -0400 |
commit | 24e9d3bbc98232062a4233f7f5de4f00cc256242 (patch) | |
tree | c8108a383e7bba48bb0346a3dc1e2f2c4b60874f /src/leap/bitmask/core | |
parent | e30e480cc6945cf59aaa4cf762fd9e9bbdc8abe3 (diff) |
[refactor] call it start/stop
Diffstat (limited to 'src/leap/bitmask/core')
-rw-r--r-- | src/leap/bitmask/core/dispatcher.py | 6 | ||||
-rw-r--r-- | src/leap/bitmask/core/dummy.py | 4 | ||||
-rw-r--r-- | src/leap/bitmask/core/service.py | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/leap/bitmask/core/dispatcher.py b/src/leap/bitmask/core/dispatcher.py index 82a0d8e..2950896 100644 --- a/src/leap/bitmask/core/dispatcher.py +++ b/src/leap/bitmask/core/dispatcher.py @@ -358,9 +358,9 @@ class CommandDispatcher(object): def do_STATUS(self, *parts): return _format_result(self.core.do_status()) - @register_method("{'shutdown': 'ok'}") - def do_SHUTDOWN(self, *parts): - return _format_result(self.core.do_shutdown()) + @register_method("{'stop': 'ok'}") + def do_STOP(self, *parts): + return _format_result(self.core.do_stop()) # ----------------------------------------------- diff --git a/src/leap/bitmask/core/dummy.py b/src/leap/bitmask/core/dummy.py index 7b6be39..64ae2b6 100644 --- a/src/leap/bitmask/core/dummy.py +++ b/src/leap/bitmask/core/dummy.py @@ -45,8 +45,8 @@ class BackendCommands(object): def do_stats(self): return {'mem_usage': '01 KB'} - def do_shutdown(self): - return {'shutdown': 'ok'} + def do_stop(self): + return {'stop': 'ok'} class mail_services(object): diff --git a/src/leap/bitmask/core/service.py b/src/leap/bitmask/core/service.py index 0d74e64..a3eb94e 100644 --- a/src/leap/bitmask/core/service.py +++ b/src/leap/bitmask/core/service.py @@ -145,8 +145,8 @@ class BitmaskBackend(configurable.ConfigurableService): def do_version(self): return self.core_commands.do_version() - def do_shutdown(self): - return self.core_commands.do_shutdown() + def do_stop(self): + return self.core_commands.do_stop() # Service Toggling @@ -211,7 +211,7 @@ class BackendCommands(object): mem = resource.getrusage(resource.RUSAGE_SELF).ru_maxrss return {'mem_usage': '%s MB' % (mem / 1024)} - def do_shutdown(self): + def do_stop(self): self.core.stopService() reactor.callLater(1, reactor.stop) - return {'shutdown': 'ok'} + return {'stop': 'ok'} |