diff options
| author | Tim Watson <tim@rabbitmq.com> | 2012-11-13 11:37:30 +0000 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2012-11-13 11:37:30 +0000 |
| commit | 8b5b3eea9aeabc199322488886a96f890d1c1f7b (patch) | |
| tree | b5eb67df5ef5a9c247c784061cb23a62264dc14f /src/rabbit.erl | |
| parent | e0509b42a7cf96c393c7c1b82cac819e33923358 (diff) | |
| parent | 9d173072c4a3883141692c5eed3a5e09b82f87df (diff) | |
| download | rabbitmq-server-git-8b5b3eea9aeabc199322488886a96f890d1c1f7b.tar.gz | |
merge default into bug25178
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 66adcca3c6..f3d31b2244 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -576,7 +576,10 @@ boot_delegate() -> rabbit_sup:start_supervisor_child(delegate_sup, [Count]). recover() -> - rabbit_binding:recover(rabbit_exchange:recover(), rabbit_amqqueue:start()). + Qs = rabbit_amqqueue:recover(), + ok = rabbit_binding:recover(rabbit_exchange:recover(), + [QName || #amqqueue{name = QName} <- Qs]), + rabbit_amqqueue:start(Qs). maybe_insert_default_data() -> case rabbit_table:is_empty() of |