summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind <git@mazdermind.de>2016-08-28 14:45:26 +0200
committerMaZderMind <git@mazdermind.de>2016-08-28 14:45:26 +0200
commit94093e6e1bf52c324d6c6141996922d35e9edfdf (patch)
treeaad04f0af7a2bfa0c22b0884889f242ffe3c3085
parentb19de71e988150d84d5f8c71c5d9981840ecdad5 (diff)
accept exit as an alias to quit on the contro-server, fixes #95
-rw-r--r--voctocore/lib/commands.py2
-rw-r--r--voctocore/lib/controlserver.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/voctocore/lib/commands.py b/voctocore/lib/commands.py
index 92db70e..a5b6ab1 100644
--- a/voctocore/lib/commands.py
+++ b/voctocore/lib/commands.py
@@ -91,7 +91,7 @@ class ControlServerCommands(object):
helplines.append(command_sig)
- helplines.append('\t'+'quit')
+ helplines.append('\t'+'quit / exit')
helplines.append("\n")
helplines.append("Source-Names:")
diff --git a/voctocore/lib/controlserver.py b/voctocore/lib/controlserver.py
index 5544e7b..4c506be 100644
--- a/voctocore/lib/controlserver.py
+++ b/voctocore/lib/controlserver.py
@@ -49,7 +49,7 @@ class ControlServer(TCPMultiConnection):
line = line.strip()
# 'quit' = remote wants us to close the connection
- if line == 'quit':
+ if line == 'quit' or line == 'exit':
self.log.info("Client asked us to close the Connection")
self.close_connection(conn)
return False