diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-08-22 23:02:31 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-08-22 23:02:31 +0100 |
| commit | b56e1cd6449d1d8551749d463069050db6f35b1e (patch) | |
| tree | bf6f8c6bcd9ef7ad37bafc22a7b5a5356d4d5b8b | |
| parent | 2d0657408280c0d0281623327b6c5085e2f8b2e5 (diff) | |
| download | rabbitmq-server-b56e1cd6449d1d8551749d463069050db6f35b1e.tar.gz | |
Use ctl wait in makefile; use setsid and backgrounding borrowed from init
| -rw-r--r-- | Makefile | 14 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 2 |
2 files changed, 11 insertions, 5 deletions
@@ -173,6 +173,12 @@ run-node: all RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \ ./scripts/rabbitmq-server +run-background-node: all + $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ + RABBITMQ_NODE_ONLY=true \ + RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \ + ./scripts/rabbitmq-server + run-tests: all OUT=$$(echo "rabbit_tests:all_tests()." | $(ERL_CALL)) ; \ echo $$OUT ; echo $$OUT | grep '^{ok, passed}$$' > /dev/null @@ -181,13 +187,13 @@ run-qc: all $(foreach MOD,$(QC_MODULES),./quickcheck $(RABBITMQ_NODENAME) $(MOD) $(QC_TRIALS)) start-background-node: - $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ - RABBITMQ_NODE_ONLY=true \ - RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -detached" \ - ./scripts/rabbitmq-server; sleep 1 + -rm $(RABBITMQ_MNESIA_DIR).pid + setsid sh -c "$(MAKE) run-background-node > $(RABBITMQ_MNESIA_DIR)/startup_log 2> $(RABBITMQ_MNESIA_DIR)/startup_err" & + sleep 1 start-rabbit-on-node: all echo "rabbit:start()." | $(ERL_CALL) + ./scripts/rabbitmqctl -n $(RABBITMQ_NODENAME) wait $(RABBITMQ_MNESIA_DIR).pid stop-rabbit-on-node: all echo "rabbit:stop()." | $(ERL_CALL) diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 35b41d59..7176d801 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -47,7 +47,7 @@ fi [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR} [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME} -[ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${RABBITMQ_MNESIA_DIR}/pid +[ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${RABBITMQ_MNESIA_DIR}.pid [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR} [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand |