From 61c390e676c8ac5756b2c7676fb37bf9e5c8177e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Fri, 1 Apr 2016 15:47:55 +0200 Subject: [PATCH] rabbitmq-run.mk: Add `start-background-broker` target This does the same thing than: make start-background-node start-rabbit-on-node Except that, if RabbitMQ fails to start, the make target fails, as opposed to `start-rabbit-on-node` which waits forever. Note: they are way too many targets to start RabbitMQ, this file and its callers need cleanup! --- deps/rabbit_common/mk/rabbitmq-run.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/deps/rabbit_common/mk/rabbitmq-run.mk b/deps/rabbit_common/mk/rabbitmq-run.mk index 9f11cd3680..1bd0f16e5d 100644 --- a/deps/rabbit_common/mk/rabbitmq-run.mk +++ b/deps/rabbit_common/mk/rabbitmq-run.mk @@ -208,6 +208,15 @@ start-background-node: node-tmpdir $(RABBITMQ_ENABLED_PLUGINS_FILE) ERL_LIBS="$(DIST_ERL_LIBS)" \ $(RABBITMQCTL) -n $(RABBITMQ_NODENAME) wait $(RABBITMQ_PID_FILE) kernel +start-background-broker: node-tmpdir $(RABBITMQ_ENABLED_PLUGINS_FILE) + $(BASIC_SCRIPT_ENV_SETTINGS) \ + $(RABBITMQ_SERVER) \ + $(REDIRECT_STDIO) & + ERL_LIBS="$(DIST_ERL_LIBS)" \ + $(RABBITMQCTL) -n $(RABBITMQ_NODENAME) wait $(RABBITMQ_PID_FILE) && \ + ERL_LIBS="$(DIST_ERL_LIBS)" \ + $(RABBITMQCTL) -n $(RABBITMQ_NODENAME) status >/dev/null + start-rabbit-on-node: $(exec_verbose) echo 'rabbit:start().' | $(ERL_CALL) $(ERL_CALL_OPTS) | sed -E '/^\{ok, ok\}$$/d' $(verbose) ERL_LIBS="$(DIST_ERL_LIBS)" \