paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

rabbitmq: Add a RABBITMQ_PORT setting.

Browse Source 
(cherry picked from commit 1492191b6d)
This commit is contained in:
Alex Vandiver
2023-02-16 11:19:57 -05:00
parent b5427709f8
commit dc4f140e85
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zerver/lib/queue.py
View File

@@ -78,6 +78,7 @@ class QueueClient(Generic[ChannelT], metaclass=ABCMeta):
return pika.ConnectionParameters( return pika.ConnectionParameters(
settings.RABBITMQ_HOST, settings.RABBITMQ_HOST,
port=settings.RABBITMQ_PORT,
heartbeat=self.rabbitmq_heartbeat, heartbeat=self.rabbitmq_heartbeat,
tcp_options=tcp_options, tcp_options=tcp_options,
credentials=credentials, credentials=credentials,

1
zproject/default_settings.py
View File

@@ -164,6 +164,7 @@ CAMO_URI = ""
MEMCACHED_LOCATION = "127.0.0.1:11211" MEMCACHED_LOCATION = "127.0.0.1:11211"
MEMCACHED_USERNAME = None if get_secret("memcached_password") is None else "zulip@localhost" MEMCACHED_USERNAME = None if get_secret("memcached_password") is None else "zulip@localhost"
RABBITMQ_HOST = "127.0.0.1" RABBITMQ_HOST = "127.0.0.1"
RABBITMQ_PORT = 5672
RABBITMQ_USERNAME = "zulip" RABBITMQ_USERNAME = "zulip"
REDIS_HOST = "127.0.0.1" REDIS_HOST = "127.0.0.1"
REDIS_PORT = 6379 REDIS_PORT = 6379

8
zproject/prod_settings_template.py
View File

@@ -553,10 +553,12 @@ SOCIAL_AUTH_SAML_SUPPORT_CONTACT = {
######## ########
## RabbitMQ configuration. ## RabbitMQ configuration.
## ##
## By default, Zulip connects to RabbitMQ running locally on the machine, ## By default, Zulip connects to RabbitMQ running locally on the
## but Zulip also supports connecting to RabbitMQ over the network; ## machine, but Zulip also supports connecting to RabbitMQ over the
## to use a remote RabbitMQ instance, set RABBITMQ_HOST to the hostname here. ## network; to use a remote RabbitMQ instance, set RABBITMQ_HOST, and
## optionally RABBITMQ_PORT, to the hostname and port here.
# RABBITMQ_HOST = "127.0.0.1" # RABBITMQ_HOST = "127.0.0.1"
# RABBITMQ_PORT = 5672
## To use another RabbitMQ user than the default "zulip", set RABBITMQ_USERNAME here. ## To use another RabbitMQ user than the default "zulip", set RABBITMQ_USERNAME here.
# RABBITMQ_USERNAME = "zulip" # RABBITMQ_USERNAME = "zulip"