diff options
| author | Alexey Lebedeff <binarin@binarin.info> | 2021-10-13 10:45:05 +0200 |
|---|---|---|
| committer | mergify-bot <noreply@mergify.io> | 2021-10-13 10:41:29 +0000 |
| commit | f941f2bc89ef150d67070b2b73bc0da9a6b7f9cb (patch) | |
| tree | 032ecb24d415cbba497fac995df5c19d206b01c8 | |
| parent | 7aa6b4a068d0640b8e952d133faf43ce53569523 (diff) | |
| download | rabbitmq-server-git-mergify/bp/v3.8.x/pr-3568.tar.gz | |
Allow having multiple `make run-broker` simulatneouslymergify/bp/v3.8.x/pr-3568
It was automatically happening for e.g. `make start-cluster`.
But some plugins were not covered by default generated config, and
running rabbit from 2 different worktrees was a bit complicated.
(cherry picked from commit 23be565a38e7fc937f4a00c1a749a5f3fb236e96)
(cherry picked from commit eec4b452866a278e3ae1a0005eab3f0d457b0fac)
# Conflicts:
# deps/rabbit_common/mk/rabbitmq-run.mk
| -rw-r--r-- | deps/rabbit_common/mk/rabbitmq-run.mk | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/deps/rabbit_common/mk/rabbitmq-run.mk b/deps/rabbit_common/mk/rabbitmq-run.mk index 2624c10f07..a133bbff7c 100644 --- a/deps/rabbit_common/mk/rabbitmq-run.mk +++ b/deps/rabbit_common/mk/rabbitmq-run.mk @@ -177,9 +177,30 @@ $(if $(RABBITMQ_NODE_PORT), {listener$(comma) [{port$(comma) $(shell echo " {rabbitmq_mqtt, [ $(if $(RABBITMQ_NODE_PORT), {tcp_listeners$(comma) [$(shell echo "$$((1883 + $(RABBITMQ_NODE_PORT) - 5672))")]},) ]}, + {rabbitmq_web_mqtt, [ +$(if $(RABBITMQ_NODE_PORT), {tcp_config$(comma) [{port$(comma) $(shell echo "$$((15675 + $(RABBITMQ_NODE_PORT) - 5672))")}]},) + ]}, + {rabbitmq_web_mqtt_examples, [ +$(if $(RABBITMQ_NODE_PORT), {listener$(comma) [{port$(comma) $(shell echo "$$((15670 + $(RABBITMQ_NODE_PORT) - 5672))")}]},) + ]}, {rabbitmq_stomp, [ $(if $(RABBITMQ_NODE_PORT), {tcp_listeners$(comma) [$(shell echo "$$((61613 + $(RABBITMQ_NODE_PORT) - 5672))")]},) ]}, +<<<<<<< HEAD +======= + {rabbitmq_web_stomp, [ +$(if $(RABBITMQ_NODE_PORT), {tcp_config$(comma) [{port$(comma) $(shell echo "$$((15674 + $(RABBITMQ_NODE_PORT) - 5672))")}]},) + ]}, + {rabbitmq_web_stomp_examples, [ +$(if $(RABBITMQ_NODE_PORT), {listener$(comma) [{port$(comma) $(shell echo "$$((15670 + $(RABBITMQ_NODE_PORT) - 5672))")}]},) + ]}, + {rabbitmq_stream, [ +$(if $(RABBITMQ_NODE_PORT), {tcp_listeners$(comma) [$(shell echo "$$((5552 + $(RABBITMQ_NODE_PORT) - 5672))")]},) + ]}, + {rabbitmq_prometheus, [ +$(if $(RABBITMQ_NODE_PORT), {tcp_config$(comma) [{port$(comma) $(shell echo "$$((15692 + $(RABBITMQ_NODE_PORT) - 5672))")}]},) + ]}, +>>>>>>> eec4b45286 (Allow having multiple `make run-broker` simulatneously) {ra, [ {data_dir, "$(RABBITMQ_QUORUM_DIR)"}, {wal_sync_method, sync} |