summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-09-26 16:53:42 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-09-26 16:53:42 -0400
commit24e9d3bbc98232062a4233f7f5de4f00cc256242 (patch)
treec8108a383e7bba48bb0346a3dc1e2f2c4b60874f
parente30e480cc6945cf59aaa4cf762fd9e9bbdc8abe3 (diff)
[refactor] call it start/stop
-rwxr-xr-xsrc/leap/bitmask/cli/bitmask_cli.py12
-rw-r--r--src/leap/bitmask/core/dispatcher.py6
-rw-r--r--src/leap/bitmask/core/dummy.py4
-rw-r--r--src/leap/bitmask/core/service.py8
4 files changed, 15 insertions, 15 deletions
diff --git a/src/leap/bitmask/cli/bitmask_cli.py b/src/leap/bitmask/cli/bitmask_cli.py
index 3fa134a..091b73f 100755
--- a/src/leap/bitmask/cli/bitmask_cli.py
+++ b/src/leap/bitmask/cli/bitmask_cli.py
@@ -43,13 +43,13 @@ SERVICE COMMANDS:
mail Bitmask Encrypted Mail
eip Encrypted Internet Proxy
keys Bitmask Keymanager
- webui Bitmask Web User Interface
+ ui Bitmask User Interface
GENERAL COMMANDS:
version prints version number and exit
- launch launch the Bitmask backend daemon
- shutdown shutdown Bitmask backend daemon
+ start starts the Bitmask backend daemon
+ stop stops the Bitmask backend daemon
status displays general status about the running Bitmask services
stats show some debug info about bitmask-core
help show this help message
@@ -57,7 +57,7 @@ GENERAL COMMANDS:
'''
epilog = ("Use 'bitmaskctl <command> help' to learn more "
"about each command.")
- commands = ['shutdown', 'stats']
+ commands = ['stop', 'stats']
def user(self, raw_args):
user = User()
@@ -75,13 +75,13 @@ GENERAL COMMANDS:
keys = Keys()
return keys.execute(raw_args)
- def webui(self, raw_args):
+ def ui(self, raw_args):
webui = WebUI()
return webui.execute(raw_args)
# Single commands
- def launch(self, raw_args):
+ def start(self, raw_args):
# XXX careful! Should see if the process in PID is running,
# avoid launching again.
import commands
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'}