diff options
| author | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2015-07-30 17:09:50 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2015-07-30 17:09:50 +0200 |
| commit | 7fa5f4eb28a9d9d4c9b5e166213b2e5d9666c2ec (patch) | |
| tree | e5fa8614cd25855d32f93ab843b8d9e2fdd33cb1 | |
| parent | 8a5c4b5a38392206ad4bb21cd4491154d2f31cfb (diff) | |
| parent | f1ce00b6ae3c4ebd1a0a105d6d9386bea8371e5f (diff) | |
| download | rabbitmq-server-git-7fa5f4eb28a9d9d4c9b5e166213b2e5d9666c2ec.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | scripts/rabbitmq-env.bat | 19 | ||||
| -rw-r--r-- | src/gm.erl | 3 |
2 files changed, 13 insertions, 9 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index 604260a0e4..7465072d19 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -84,23 +84,28 @@ REM set RABBITMQ_NODE_PORT=5672 REM ) REM ) -REM DOUBLE CHECK THIS LOGIC if "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( - if "!NODE_IP_ADDRESS!"=="" ( - set RABBITMQ_NODE_IP_ADDRESS=auto - ) else ( + if not "!NODE_IP_ADDRESS!"=="" ( set RABBITMQ_NODE_IP_ADDRESS=!NODE_IP_ADDRESS! ) ) if "!RABBITMQ_NODE_PORT!"=="" ( - if "!NODE_PORT!"=="" ( - set RABBITMQ_NODE_PORT=5672 - ) else ( + if not "!NODE_PORT!"=="" ( set RABBITMQ_NODE_PORT=!NODE_PORT! ) ) +if "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( + if not "!RABBITMQ_NODE_PORT!"=="" ( + set RABBITMQ_NODE_IP_ADDRESS=auto + ) +) else ( + if "!RABBITMQ_NODE_PORT!"=="" ( + set RABBITMQ_NODE_PORT=5672 + ) +) + REM [ "x" = "x$RABBITMQ_DIST_PORT" ] && RABBITMQ_DIST_PORT=${DIST_PORT} REM [ "x" = "x$RABBITMQ_DIST_PORT" ] && [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_DIST_PORT=$((${DEFAULT_NODE_PORT} + 20000)) REM [ "x" = "x$RABBITMQ_DIST_PORT" ] && [ "x" != "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_DIST_PORT=$((${RABBITMQ_NODE_PORT} + 20000)) diff --git a/src/gm.erl b/src/gm.erl index 4c1b4ee4cb..dbf9c295f9 100644 --- a/src/gm.erl +++ b/src/gm.erl @@ -752,8 +752,7 @@ handle_info({'DOWN', MRef, process, _Pid, Reason}, end. -terminate(Reason, State = #state { module = Module, - callback_args = Args }) -> +terminate(Reason, #state { module = Module, callback_args = Args }) -> Module:handle_terminate(Args, Reason). |