diff options
| author | Michael Bridgen <mikeb@rabbitmq.com> | 2011-08-23 18:41:02 +0100 |
|---|---|---|
| committer | Michael Bridgen <mikeb@rabbitmq.com> | 2011-08-23 18:41:02 +0100 |
| commit | cedc0b54532a6ce3958a1e07d1e9c31af4e0eff3 (patch) | |
| tree | 2a41b8cce3c8072439eee1fc13b94b41205f2fc1 /src/rabbit.erl | |
| parent | c5bb2b42652d095b96272d12cbe7a770ff79f439 (diff) | |
| parent | 5b8affbb142df2d715f9a2f20cdc880db8507bdb (diff) | |
| download | rabbitmq-server-git-cedc0b54532a6ce3958a1e07d1e9c31af4e0eff3.tar.gz | |
Merge in default. Many conflicts unhappy face
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index e067607da6..8cae7fde86 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -19,7 +19,7 @@ -behaviour(application). -export([prepare/0, start/0, stop/0, stop_and_halt/0, status/0, environment/0, - rotate_logs/1]). + rotate_logs/1, force_event_refresh/0]). -export([start/2, stop/1]). @@ -187,8 +187,9 @@ -spec(prepare/0 :: () -> 'ok'). -spec(start/0 :: () -> 'ok'). -spec(stop/0 :: () -> 'ok'). --spec(stop_and_halt/0 :: () -> 'ok'). +-spec(stop_and_halt/0 :: () -> no_return()). -spec(rotate_logs/1 :: (file_suffix()) -> rabbit_types:ok_or_error(any())). +-spec(force_event_refresh/0 :: () -> 'ok'). -spec(status/0 :: () -> [{pid, integer()} | {running_applications, [{atom(), string(), string()}]} | @@ -512,6 +513,12 @@ log_rotation_result(ok, {error, SaslLogError}) -> log_rotation_result(ok, ok) -> ok. +force_event_refresh() -> + rabbit_direct:force_event_refresh(), + rabbit_networking:force_connection_event_refresh(), + rabbit_channel:force_event_refresh(), + rabbit_amqqueue:force_event_refresh(). + %%--------------------------------------------------------------------------- %% misc |