summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2016-04-11 17:15:40 +0300
committerMichael Klishin <michael@novemberain.com>2016-04-11 17:15:40 +0300
commitd37a278ffb865048e5bbf843495d928efb49439a (patch)
tree497be9dd747f47676dd6a9476c93641961f1e4f5 /src
parent64f57943434c4b699585427f19fa7f5125d19faf (diff)
parentf6404b19e09ad2b14957f68fe7215fb7916ccbd5 (diff)
downloadrabbitmq-server-git-d37a278ffb865048e5bbf843495d928efb49439a.tar.gz
Merge pull request #729 from rabbitmq/rabbitmq-management-163
Add upgrade function adding listener socket options
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_upgrade_functions.erl10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/rabbit_upgrade_functions.erl b/src/rabbit_upgrade_functions.erl
index f9ed62b4b2..b99a1d12ee 100644
--- a/src/rabbit_upgrade_functions.erl
+++ b/src/rabbit_upgrade_functions.erl
@@ -24,6 +24,7 @@
-rabbit_upgrade({remove_user_scope, mnesia, []}).
-rabbit_upgrade({hash_passwords, mnesia, []}).
-rabbit_upgrade({add_ip_to_listener, mnesia, []}).
+-rabbit_upgrade({add_opts_to_listener, mnesia, [add_ip_to_listener]}).
-rabbit_upgrade({internal_exchanges, mnesia, []}).
-rabbit_upgrade({user_to_internal_user, mnesia, [hash_passwords]}).
-rabbit_upgrade({topic_trie, mnesia, []}).
@@ -60,6 +61,7 @@
-spec(remove_user_scope/0 :: () -> 'ok').
-spec(hash_passwords/0 :: () -> 'ok').
-spec(add_ip_to_listener/0 :: () -> 'ok').
+-spec(add_opts_to_listener/0 :: () -> 'ok').
-spec(internal_exchanges/0 :: () -> 'ok').
-spec(user_to_internal_user/0 :: () -> 'ok').
-spec(topic_trie/0 :: () -> 'ok').
@@ -126,6 +128,14 @@ add_ip_to_listener() ->
end,
[node, protocol, host, ip_address, port]).
+add_opts_to_listener() ->
+ transform(
+ rabbit_listener,
+ fun ({listener, Node, Protocol, Host, IP, Port}) ->
+ {listener, Node, Protocol, Host, IP, Port, []}
+ end,
+ [node, protocol, host, ip_address, port, opts]).
+
internal_exchanges() ->
Tables = [rabbit_exchange, rabbit_durable_exchange],
AddInternalFun =