Merge branch 'master' into rabbitmq-server-591

9 files changed, 139 insertions, 58 deletions

diff --git a/scripts/rabbitmq-defaults.bat b/scripts/rabbitmq-defaults.bat
index 5612af967a..6919ca6a4e 100644
--- a/scripts/rabbitmq-defaults.bat
+++ b/scripts/rabbitmq-defaults.bat
@@ -49,6 +49,4 @@ REM PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
 for /f "delims=" %%F in ("!TDP0!..\plugins") do set PLUGINS_DIR=%%~dpsF%%~nF%%~xF

 

 REM CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf

-if "!RABBITMQ_CONF_ENV_FILE!"=="" (

-    set RABBITMQ_CONF_ENV_FILE=!RABBITMQ_BASE!\rabbitmq-env-conf.bat

-)

+set CONF_ENV_FILE=!RABBITMQ_BASE!\rabbitmq-env-conf.bat

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 8ceb8c94f2..b59e323e66 100644
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -65,20 +65,15 @@ RABBITMQ_HOME="$(rmq_realpath "${RABBITMQ_SCRIPTS_DIR}/..")"
 ## Common defaults
 SERVER_ERL_ARGS="+P 1048576"
 
-# warn about old rabbitmq.conf file, if no new one
-if [ -f /etc/rabbitmq/rabbitmq.conf ] && \
-   [ ! -f ${CONF_ENV_FILE} ] ; then
-    echo -n "WARNING: ignoring /etc/rabbitmq/rabbitmq.conf -- "
-    echo "location has moved to ${CONF_ENV_FILE}"
-fi
-
 # We save the current value of $RABBITMQ_PID_FILE in case it was set by
 # an init script. If $CONF_ENV_FILE overrides it again, we must ignore
 # it and warn the user.
 saved_RABBITMQ_PID_FILE=$RABBITMQ_PID_FILE
 
 ## Get configuration variables from the configure environment file
-[ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true
+[ "x" = "x$RABBITMQ_CONF_ENV_FILE" ] && RABBITMQ_CONF_ENV_FILE=${CONF_ENV_FILE}
+
+[ -f ${RABBITMQ_CONF_ENV_FILE} ] && . ${RABBITMQ_CONF_ENV_FILE} || true
 
 if [ "$saved_RABBITMQ_PID_FILE" -a \
      "$saved_RABBITMQ_PID_FILE" != "$RABBITMQ_PID_FILE" ]; then
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 430395accf..71752c667f 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -47,6 +47,10 @@ REM set SERVER_ERL_ARGS=+P 1048576
 

 REM ## Get configuration variables from the configure environment file

 REM [ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true

+if "!RABBITMQ_CONF_ENV_FILE!"=="" (

+    set RABBITMQ_CONF_ENV_FILE=!CONF_ENV_FILE!

+)

+

 if exist "!RABBITMQ_CONF_ENV_FILE!" (

     call "!RABBITMQ_CONF_ENV_FILE!"

 )

@@ -77,7 +81,7 @@ if "!RABBITMQ_NODENAME!"=="" (
     if "!NODENAME!"=="" (

         REM We use Erlang to query the local hostname because

         REM !COMPUTERNAME! and Erlang may return different results.

-        REM Start erl with -sname to make sure epmd is started. 

+        REM Start erl with -sname to make sure epmd is started.

         call "%ERLANG_HOME%\bin\erl.exe" -A0 -noinput -boot start_clean -sname rabbit-prelaunch-epmd -eval "init:stop()." >nul 2>&1

         for /f "delims=" %%F in ('call "%ERLANG_HOME%\bin\erl.exe" -A0 -noinput -boot start_clean -eval "net_kernel:start([list_to_atom(""rabbit-gethostname-"" ++ os:getpid()), %NAMETYPE%]), [_, H] = string:tokens(atom_to_list(node()), ""@""), io:format(""~s~n"", [H]), init:stop()."') do @set HOSTNAME=%%F

         set RABBITMQ_NODENAME=rabbit@!HOSTNAME!

@@ -150,6 +154,8 @@ REM [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_
 REM No Windows equivalent

 

 REM [ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE}

+

+CALL :unquote RABBITMQ_CONFIG_FILE %RABBITMQ_CONFIG_FILE%

 if "!RABBITMQ_CONFIG_FILE!"=="" (

     if "!CONFIG_FILE!"=="" (

         set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

@@ -166,11 +172,12 @@ if "!RABBITMQ_GENERATED_CONFIG_DIR!"=="" (
     )

 )

 

+CALL :unquote RABBITMQ_ADVANCED_CONFIG_FILE %RABBITMQ_ADVANCED_CONFIG_FILE%

 if "!RABBITMQ_ADVANCED_CONFIG_FILE!"=="" (

     if "!ADVANCED_CONFIG_FILE!"=="" (

         set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced

     ) else (

-        set RABBITMQ_ADVANCED_CONFIG_FILE=!GENERATED_CONFIG_DIR!

+        set RABBITMQ_ADVANCED_CONFIG_FILE=!ADVANCED_CONFIG_FILE!

     )

 )

 

@@ -417,3 +424,7 @@ REM ##--- End of overridden <var_name> variables
 REM

 REM # Since we source this elsewhere, don't accidentally stop execution

 REM true

+

+:unquote

+set %1=%~2

+EXIT /B 0

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 98a4c70120..507a3ebfd9 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -62,6 +62,11 @@ RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
 
 set +e
 
+RABBITMQ_ADVANCED_CONFIG_FILE_NOEX="${RABBITMQ_ADVANCED_CONFIG_FILE%.*}"
+if [ "${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}.config" = "${RABBITMQ_ADVANCED_CONFIG_FILE}" ]; then
+    RABBITMQ_ADVANCED_CONFIG_FILE="${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}"
+fi
+
 # NOTIFY_SOCKET is needed here to prevent epmd from impersonating the
 # success of our startup sequence to systemd.
 NOTIFY_SOCKET= \
@@ -77,7 +82,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \
     -rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \
     -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \
     -extra "${RABBITMQ_NODENAME}"
-    
+
 PRELAUNCH_RESULT=$?
 if [ ${PRELAUNCH_RESULT} = 2 ] ; then
     # dist port is mentioned in config, so do not set it
@@ -95,10 +100,14 @@ fi
 
 set -e
 
-if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then
-    RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}"
-elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then
-    RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} \
+RABBITMQ_CONFIG_FILE_NOEX="${RABBITMQ_CONFIG_FILE%.*}"
+
+if [ "${RABBITMQ_CONFIG_FILE_NOEX}.config" = "${RABBITMQ_CONFIG_FILE}" ]; then
+    if [ -f "${RABBITMQ_CONFIG_FILE}" ]; then
+        RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE_NOEX}"
+    fi
+elif [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" = "${RABBITMQ_CONFIG_FILE}" ]; then
+    RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE_NOEX} \
                          -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \
                          -conf_script_dir `dirname $0` \
                          -conf_schema_dir ${RABBITMQ_SCHEMA_DIR}"
@@ -107,6 +116,20 @@ elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then
                              -conf_advanced ${RABBITMQ_ADVANCED_CONFIG_FILE} \
                              -config ${RABBITMQ_ADVANCED_CONFIG_FILE}"
     fi
+else
+    if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then
+        RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}"
+    elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then
+        RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} \
+                             -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \
+                             -conf_script_dir `dirname $0` \
+                             -conf_schema_dir ${RABBITMQ_SCHEMA_DIR}"
+        if [ -f "${RABBITMQ_ADVANCED_CONFIG_FILE}.config" ]; then
+            RABBITMQ_CONFIG_ARG="${RABBITMQ_CONFIG_ARG} \
+                                 -conf_advanced ${RABBITMQ_ADVANCED_CONFIG_FILE} \
+                                 -config ${RABBITMQ_ADVANCED_CONFIG_FILE}"
+        fi
+    fi
 fi
 
 RABBITMQ_LISTEN_ARG=
@@ -198,7 +221,7 @@ check_not_empty() {
     eval value=\$$name
     if [ -z "$value" ]; then
         echo "Error: ENV variable should be defined: $1.
-       Please check rabbitmq-env, rabbitmq-defaults, and $CONF_ENV_FILE script files"
+       Please check rabbitmq-env, rabbitmq-defaults, and ${RABBITMQ_CONF_ENV_FILE} script files"
         exit 78
     fi
 }
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf
index 5ead9a81ad..301f7a1fc7 100755
--- a/scripts/rabbitmq-server-ha.ocf
+++ b/scripts/rabbitmq-server-ha.ocf
@@ -1479,6 +1479,7 @@ get_monitor() {
 
             if [ -n "$master_name" ]; then
                 ocf_log info "${LH} master exists and rabbit app is not running. Exiting to be restarted by pacemaker"
+                stop_server_process
                 rc=$OCF_ERR_GENERIC
             fi
         fi
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 2a38e77a82..d87dc9d5fb 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -42,7 +42,10 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
 

 set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin

 

-set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!"

+CALL :get_noex !RABBITMQ_ADVANCED_CONFIG_FILE! RABBITMQ_ADVANCED_CONFIG_FILE_NOEX

+if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.config" (

+    set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!

+)

 

 "!ERLANG_HOME!\bin\erl.exe" ^

         -pa "!RABBITMQ_EBIN_ROOT!" ^

@@ -68,10 +71,14 @@ if not exist "!RABBITMQ_SCHEMA_DIR!\rabbitmq.schema" (
 

 set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!"

 

-if exist "!RABBITMQ_CONFIG_FILE!.config" (

-    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

-) else if exist "!RABBITMQ_CONFIG_FILE!.conf" (

-    set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^

+CALL :get_noex !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE_NOEX

+

+if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.config" (

+    if exist "!RABBITMQ_CONFIG_FILE!" (

+        set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE_NOEX!"

+    )

+) else if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.conf" (

+    set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE_NOEX!" ^

                             -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^

                             -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^

                             -conf_schema_dir !RABBITMQ_SCHEMA_DIR!

@@ -80,7 +87,21 @@ if exist "!RABBITMQ_CONFIG_FILE!.config" (
                                 -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^

                                 -config "!RABBITMQ_ADVANCED_CONFIG_FILE!"

     )

-) 

+) else (

+    if exist "!RABBITMQ_CONFIG_FILE!.config" (

+        set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

+    ) else if exist "!RABBITMQ_CONFIG_FILE!.conf" (

+        set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^

+                                -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^

+                                -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^

+                                -conf_schema_dir !RABBITMQ_SCHEMA_DIR!

+        if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (

+            set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^

+                                    -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^

+                                    -config "!RABBITMQ_ADVANCED_CONFIG_FILE!"

+        )

+    )

+)

 

 set RABBITMQ_LISTEN_ARG=

 if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

@@ -110,11 +131,11 @@ if "!RABBITMQ_NODE_ONLY!"=="" (
 

 if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" (

     set RABBITMQ_IO_THREAD_POOL_SIZE=64

-) 

+)

 

 

 set ENV_OK=true

-CALL :check_not_empty "RABBITMQ_BOOT_MODULE" !RABBITMQ_BOOT_MODULE! 

+CALL :check_not_empty "RABBITMQ_BOOT_MODULE" !RABBITMQ_BOOT_MODULE!

 CALL :check_not_empty "RABBITMQ_NAME_TYPE" !RABBITMQ_NAME_TYPE!

 CALL :check_not_empty "RABBITMQ_NODENAME" !RABBITMQ_NODENAME!

 

@@ -157,10 +178,14 @@ EXIT /B 0
 if "%~2"=="" (

     ECHO "Error: ENV variable should be defined: %1. Please check rabbitmq-env and rabbitmq-defaults, and !RABBITMQ_CONF_ENV_FILE! script files. Check also your Environment Variables settings"

     set ENV_OK=false

-    EXIT /B 78 

+    EXIT /B 78

     )

 EXIT /B 0

 

+:get_noex

+set "%~2=%~dpn1"

+EXIT /B 0

+

 endlocal

 endlocal

 

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 7e80e78398..8a77fa1769 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -124,8 +124,11 @@ if errorlevel 1 (
 

 set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin

 

-set RABBITMQ_CONFIG_FILE="!RABBITMQ_CONFIG_FILE!"

+CALL :get_noex !RABBITMQ_ADVANCED_CONFIG_FILE! RABBITMQ_ADVANCED_CONFIG_FILE_NOEX

 

+if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.config" (

+    set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!

+)

 

 "!ERLANG_HOME!\bin\erl.exe" ^

         -pa "!RABBITMQ_EBIN_ROOT!" ^

@@ -157,12 +160,14 @@ if not exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (
     echo []. > !RABBITMQ_ADVANCED_CONFIG_FILE!.config

 )

 

-if exist "!RABBITMQ_CONFIG_FILE!.config" (

-    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

-) else (

-    rem Always specify generated config arguments, we cannot

-    rem assume .conf file is available

-    set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^

+CALL :get_noex !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE_NOEX

+

+if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.config" (

+    if exist "!RABBITMQ_CONFIG_FILE!" (

+        set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE_NOEX!"

+    )

+) else if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.conf" (

+    set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE_NOEX!" ^

                             -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^

                             -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^

                             -conf_schema_dir !RABBITMQ_SCHEMA_DIR!

@@ -171,8 +176,25 @@ if exist "!RABBITMQ_CONFIG_FILE!.config" (
                                 -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^

                                 -config "!RABBITMQ_ADVANCED_CONFIG_FILE!"

     )

+) else (

+    if exist "!RABBITMQ_CONFIG_FILE!.config" (

+        set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

+    ) else (

+        rem Always specify generated config arguments, we cannot

+        rem assume .conf file is available

+        set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^

+                                -conf_dir !RABBITMQ_GENERATED_CONFIG_DIR! ^

+                                -conf_script_dir !CONF_SCRIPT_DIR:\=/! ^

+                                -conf_schema_dir !RABBITMQ_SCHEMA_DIR!

+        if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (

+            set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^

+                                    -conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^

+                                    -config "!RABBITMQ_ADVANCED_CONFIG_FILE!"

+        )

+    )

 )

 

+

 set RABBITMQ_LISTEN_ARG=

 if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

    if not "!RABBITMQ_NODE_PORT!"=="" (

@@ -227,8 +249,6 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 !RABBITMQ_DIST_ARG! ^

 !STARVAR!

 

-echo "!ERLANG_SERVICE_ARGUMENTS!" > "!RABBITMQ_CONFIG_FILE!.txt"

-

 set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:\=\\!

 set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:"=\"!

 

@@ -267,5 +287,9 @@ if "%~2"=="" (
     )

 EXIT /B 0

 

+:get_noex

+set "%~2=%~dpn1"

+EXIT /B 0

+

 endlocal

 endlocal

diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl
index 3f83a153ea..e872663200 100644
--- a/src/rabbit_prelaunch.erl
+++ b/src/rabbit_prelaunch.erl
@@ -79,35 +79,39 @@ duplicate_node_check(NodeName, NodeHost) ->
     end.
 
 dist_port_set_check() ->
-    case os:getenv("RABBITMQ_CONFIG_FILE") of
-        false ->
+    case get_config(os:getenv("RABBITMQ_CONFIG_FILE")) of
+        {ok, [Config]} ->
+            Kernel = pget(kernel, Config, []),
+            case {pget(inet_dist_listen_min, Kernel, none),
+                  pget(inet_dist_listen_max, Kernel, none)} of
+                {none, none} -> ok;
+                _            -> rabbit_misc:quit(?DO_NOT_SET_DIST_PORT)
+            end;
+        {ok, _} ->
             ok;
-        File ->
-            case get_config(File) of
-                {ok, [Config]} ->
-                    Kernel = pget(kernel, Config, []),
-                    case {pget(inet_dist_listen_min, Kernel, none),
-                          pget(inet_dist_listen_max, Kernel, none)} of
-                        {none, none} -> ok;
-                        _            -> rabbit_misc:quit(?DO_NOT_SET_DIST_PORT)
-                    end;
-                {ok, _} ->
-                    ok;
-                {error, _} ->
-                    ok
-            end
+        {error, _} ->
+            ok
     end.
 
-get_config(File) ->
-    case rabbit_file:is_file(File ++ ".config") of
-        true  -> file:consult(File ++ ".config");
-        false ->
+get_config(File)  ->
+    case consult_file(File) of
+        {ok, Contents} -> {ok, Contents};
+        {error, _}     ->
             case rabbit_config:get_advanced_config() of
                 none     -> {error, enoent};
                 FileName -> file:consult(FileName)
             end
     end.
 
+consult_file(false) -> {error, nofile};
+consult_file(File)  ->
+    FileName = case filename:extension(File) of
+        ""        -> File ++ ".config";
+        ".config" -> File;
+        _         -> ""
+    end,
+    file:consult(FileName).
+
 dist_port_range_check() ->
     case os:getenv("RABBITMQ_DIST_PORT") of
         false   -> ok;
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl
index d5f7328fec..82effb4fc5 100644
--- a/src/rabbit_vm.erl
+++ b/src/rabbit_vm.erl
@@ -45,7 +45,7 @@ memory() ->
 
     Mnesia       = mnesia_memory(),
     MsgIndexETS  = ets_memory([msg_store_persistent, msg_store_transient]),
-    MgmtDbETS    = ets_memory([rabbit_mgmt_db]),
+    MgmtDbETS    = ets_memory([rabbit_mgmt_event_collector]),
 
     [{total,     Total},
      {processes, Processes},