diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-08-09 11:31:48 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-08-09 11:31:48 +0100 |
| commit | d13177cc7ef5466f09f2827fc040c4725b8ccf2c (patch) | |
| tree | 81c8e930fe75478f00488a1b97f9a3148321170e | |
| parent | 5c85a01c0e62f12a320f6eeea443f7e4d3dfb0d2 (diff) | |
| download | rabbitmq-server-git-d13177cc7ef5466f09f2827fc040c4725b8ccf2c.tar.gz | |
Export amqqueue:list/0. Remove filter_exit_map use and timer:sleep/1.
| -rw-r--r-- | src/rabbit_amqqueue.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index fd7f86f5ab..fbea763c5b 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -21,7 +21,7 @@ -export([lookup/1, with/2, with_or_die/2, assert_equivalence/5, check_exclusive_access/2, with_exclusive_access_or_die/3, stat/1, deliver/2, requeue/3, ack/3, reject/4]). --export([list/1, info_keys/0, info/1, info/2, info_all/1, info_all/2]). +-export([list/0, list/1, info_keys/0, info/1, info/2, info_all/1, info_all/2]). -export([force_event_refresh/0]). -export([consumers/1, consumers_all/1, consumer_info_keys/0]). -export([basic_get/3, basic_consume/7, basic_cancel/4]). @@ -80,6 +80,7 @@ -> 'ok' | rabbit_types:channel_exit()). -spec(with_exclusive_access_or_die/3 :: (name(), pid(), qfun(A)) -> A | rabbit_types:channel_exit()). +-spec(list/0 :: () -> [rabbit_types:amqqueue()]). -spec(list/1 :: (rabbit_types:vhost()) -> [rabbit_types:amqqueue()]). -spec(info_keys/0 :: () -> rabbit_types:info_keys()). -spec(info/1 :: (rabbit_types:amqqueue()) -> rabbit_types:infos()). diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index f875807ccd..76367c1928 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -164,8 +164,7 @@ ready_for_close(Pid) -> gen_server2:cast(Pid, ready_for_close). force_event_refresh() -> - rabbit_misc:filter_exit_map( - fun (C) -> gen_server2:cast(C, force_event_refresh) end, list()), + [gen_server2:cast(C, force_event_refresh) || C <- list()], ok. %%--------------------------------------------------------------------------- diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 23cae9a671..5d2bcff5d2 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1286,8 +1286,12 @@ test_spawn(Node) -> test_spawn_remote() -> RPC = self(), spawn(fun () -> - RPC ! test_spawn(), - timer:sleep(60000) + {Writer, Ch} = test_spawn(), + RPC ! {Writer, Ch}, + link(Ch), + receive + _ -> ok + end end), receive Res -> Res after 1000 -> throw(failed_to_receive_result) |