diff options
| -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). |