@@ -48,10 +48,10 @@ stop(_State) ->
48
48
% % about-to-disable apps from our new dispatcher.
49
49
reset_dispatcher (IgnoreApps ) ->
50
50
unregister_all_contexts (),
51
- start_configured_listener (IgnoreApps , false ).
51
+ start_configured_listeners (IgnoreApps , false ).
52
52
53
- -spec start_configured_listener ([atom ()], boolean ()) -> ok .
54
- start_configured_listener (IgnoreApps , NeedLogStartup ) ->
53
+ -spec start_configured_listeners ([atom ()], boolean ()) -> ok .
54
+ start_configured_listeners (IgnoreApps , NeedLogStartup ) ->
55
55
[start_listener (Listener , IgnoreApps , NeedLogStartup )
56
56
|| Listener <- get_listeners_config ()],
57
57
ok .
@@ -118,31 +118,44 @@ has_configured_listener(Key) ->
118
118
end .
119
119
120
120
get_legacy_listener () ->
121
- {ok , Listener } = application :get_env (rabbitmq_management , listener ),
122
- Listener .
121
+ {ok , Listener0 } = application :get_env (rabbitmq_management , listener ),
122
+ {ok , Listener1 } = ensure_port (tcp , Listener0 ),
123
+ Listener1 .
123
124
124
125
get_tls_listener () ->
125
126
{ok , Listener0 } = application :get_env (rabbitmq_management , ssl_config ),
127
+ {ok , Listener1 } = ensure_port (tls , Listener0 ),
128
+ Port = proplists :get_value (port , Listener1 ),
126
129
case proplists :get_value (cowboy_opts , Listener0 ) of
127
130
undefined ->
128
- [{ssl , true }, {ssl_opts , Listener0 }];
131
+ [
132
+ {port , Port },
133
+ {ssl , true },
134
+ {ssl_opts , Listener0 }
135
+ ];
129
136
CowboyOpts ->
130
137
Listener1 = lists :keydelete (cowboy_opts , 1 , Listener0 ),
131
- [{ssl , true }, {ssl_opts , Listener1 }, {cowboy_opts , CowboyOpts }]
138
+ [
139
+ {port , Port },
140
+ {ssl , true },
141
+ {ssl_opts , Listener1 },
142
+ {cowboy_opts , CowboyOpts }
143
+ ]
132
144
end .
133
145
134
146
get_tcp_listener () ->
135
- application :get_env (rabbitmq_management , tcp_config , []).
147
+ Listener0 = application :get_env (rabbitmq_management , tcp_config , []),
148
+ {ok , Listener1 } = ensure_port (tcp , Listener0 ),
149
+ Listener1 .
136
150
137
- start_listener (Listener0 , IgnoreApps , NeedLogStartup ) ->
138
- {Type , ContextName } = case is_tls (Listener0 ) of
151
+ start_listener (Listener , IgnoreApps , NeedLogStartup ) ->
152
+ {Type , ContextName } = case is_tls (Listener ) of
139
153
true -> {tls , ? TLS_CONTEXT };
140
154
false -> {tcp , ? TCP_CONTEXT }
141
155
end ,
142
- {ok , Listener1 } = ensure_port (Type , Listener0 ),
143
- {ok , _ } = register_context (ContextName , Listener1 , IgnoreApps ),
156
+ {ok , _ } = register_context (ContextName , Listener , IgnoreApps ),
144
157
case NeedLogStartup of
145
- true -> log_startup (Type , Listener1 );
158
+ true -> log_startup (Type , Listener );
146
159
false -> ok
147
160
end ,
148
161
ok .
@@ -189,5 +202,5 @@ start() ->
189
202
% % Modern TCP listener uses management.tcp.*.
190
203
% % Legacy TCP (or TLS) listener uses management.listener.*.
191
204
% % Modern TLS listener uses management.ssl.*
192
- start_configured_listener ([], true ),
205
+ start_configured_listeners ([], true ),
193
206
rabbit_mgmt_sup_sup :start_link ().
0 commit comments