Skip to content

Commit f09935e

Browse files
MB-48411: Sync with proper menelaus_event handler
... when waiting for web servers restart Change-Id: If28f65fd8d05293de9b6f907a299c0c56f172684 Reviewed-on: http://review.couchbase.org/c/ns_server/+/161281 Well-Formed: Restriction Checker Well-Formed: Build Bot <[email protected]> Tested-by: Build Bot <[email protected]> Tested-by: Timofey Barmin <[email protected]> Reviewed-by: Aliaksey Artamonau <[email protected]>
1 parent 8f6be46 commit f09935e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/menelaus_web_node.erl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ node_init(Req, Props) ->
150150
ok ->
151151
%% Wait for web servers to restart
152152
ns_config:sync_announcements(),
153-
menelaus_event:sync(ns_config_events),
153+
menelaus_event:sync(chronicle_compat_events:event_manager()),
154154
cluster_compat_mode:is_enterprise() andalso
155155
ns_ssl_services_setup:sync();
156156
{error, Msg} ->
@@ -1091,7 +1091,8 @@ handle_setup_net_config(Req) ->
10911091
ok ->
10921092
%% Wait for web servers to restart
10931093
ns_config:sync_announcements(),
1094-
menelaus_event:sync(ns_config_events),
1094+
menelaus_event:sync(
1095+
chronicle_compat_events:event_manager()),
10951096
cluster_compat_mode:is_enterprise() andalso
10961097
ns_ssl_services_setup:sync(),
10971098
menelaus_util:reply(Req, 200);

src/ns_cluster.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ apply_net_config(NodeKVList) ->
194194
case netconfig_updater:apply_config(Props) of
195195
ok ->
196196
ns_config:sync_announcements(),
197-
menelaus_event:sync(ns_config_events),
197+
menelaus_event:sync(chronicle_compat_events:event_manager()),
198198
cluster_compat_mode:is_enterprise() andalso
199199
ns_ssl_services_setup:sync(),
200200
ok;

0 commit comments

Comments
 (0)