Consistently use Botserver instead of botserver or bot server.

This commit is contained in:
Robert Hönig 2018-05-29 10:58:37 +02:00
parent 762118bbea
commit 64a1306e39
4 changed files with 4 additions and 4 deletions

View file

@ -11,7 +11,7 @@ This repository contains the source code for Zulip's PyPI packages:
* `zulip_bots`: [PyPI package](https://pypi.python.org/pypi/zulip-bots) * `zulip_bots`: [PyPI package](https://pypi.python.org/pypi/zulip-bots)
for Zulip's bots and bots API. for Zulip's bots and bots API.
* `zulip_botserver`: [PyPI package](https://pypi.python.org/pypi/zulip-botserver) * `zulip_botserver`: [PyPI package](https://pypi.python.org/pypi/zulip-botserver)
for Zulip's Flask bot server. for Zulip's Flask Botserver.
The source code is written in *Python 3*. The source code is written in *Python 3*.

View file

@ -1,5 +1,5 @@
[program:zulip-bot-server] [program:zulip-bot-server]
command=zulip-bot-server --config-file=<path/to/your/botserverrc> --hostname <address> --port <port> command=zulip-bot-server --config-file=<path/to/your/botserverrc> --hostname <address> --port <port>
startsecs=3 startsecs=3
stdout_logfile=/var/log/zulip_botserver.log ; all output of your botserver will be logged here stdout_logfile=/var/log/zulip_botserver.log ; all output of your Botserver will be logged here
redirect_stderr=true redirect_stderr=true

View file

@ -22,7 +22,7 @@ def parse_args() -> argparse.Namespace:
'--config-file', '--config-file',
action='store', action='store',
required=True, required=True,
help='Config file for the zulip bot server (botserverrc)' help='Config file for the zulip Botserver (botserverrc)'
) )
parser.add_argument( parser.add_argument(
'--bot-config-file', '--bot-config-file',

View file

@ -109,7 +109,7 @@ def handle_bot() -> Union[str, BadRequest]:
bot = bot_name bot = bot_name
break break
else: else:
return BadRequest("Cannot find a bot with email {} in the bot server " return BadRequest("Cannot find a bot with email {} in the Botserver "
"configuration file. Do the emails in your botserverrc " "configuration file. Do the emails in your botserverrc "
"match the bot emails on the server?".format(event['bot_email'])) "match the bot emails on the server?".format(event['bot_email']))
lib_module = app.config.get("BOTS_LIB_MODULES", {})[bot] lib_module = app.config.get("BOTS_LIB_MODULES", {})[bot]