diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-07-05 22:06:55 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-07-05 22:13:30 +0300 |
| commit | 2143e256a0e529c84a4366118701420897e85771 (patch) | |
| tree | a602c8b322346aee9dfcdc1f0f394b4bea8ad430 /src | |
| parent | 1d3c3c43de2cd1973f8f079d781c0e5361ba6f65 (diff) | |
| download | rabbitmq-server-git-2143e256a0e529c84a4366118701420897e85771.tar.gz | |
Emit vhost_deleted first, like before
It wasn't an intended change and it breaks per-vhost connection
limit test suite.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_vhost.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_vhost.erl b/src/rabbit_vhost.erl index 96e8ebda62..7513c23925 100644 --- a/src/rabbit_vhost.erl +++ b/src/rabbit_vhost.erl @@ -133,12 +133,12 @@ delete(VHostPath, ActingUser) -> #exchange{name = Name} <- rabbit_exchange:list(VHostPath)], Funs = rabbit_misc:execute_mnesia_transaction( with(VHostPath, fun () -> internal_delete(VHostPath, ActingUser) end)), + ok = rabbit_event:notify(vhost_deleted, [{name, VHostPath}, + {user_who_performed_action, ActingUser}]), [case Fun() of ok -> ok; {error, {no_such_vhost, VHostPath}} -> ok end || Fun <- Funs], - ok = rabbit_event:notify(vhost_deleted, [{name, VHostPath}, - {user_who_performed_action, ActingUser}]), %% After vhost was deleted from mnesia DB, we try to stop vhost supervisors %% on all the nodes. rabbit_vhost_sup_sup:delete_on_all_nodes(VHostPath), |
