summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@lshift.net>2010-04-22 13:07:13 +0100
committerSimon MacMullen <simon@lshift.net>2010-04-22 13:07:13 +0100
commit8786ed508ec2d10373a4ac36147080a9fc3537ad (patch)
tree30cc769e25d8c50b96e9676daeaae72f1476744d
parent8b540eccf13988d118603895fcb5aa0062b38c36 (diff)
downloadrabbitmq-server-8786ed508ec2d10373a4ac36147080a9fc3537ad.tar.gz
Remove delegate_sup_sup, make delegates restartable on error.
-rw-r--r--src/delegate_sup.erl2
-rw-r--r--src/rabbit.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/delegate_sup.erl b/src/delegate_sup.erl
index f7a1c586..d9722a11 100644
--- a/src/delegate_sup.erl
+++ b/src/delegate_sup.erl
@@ -50,7 +50,7 @@ start_link() ->
init(_Args) ->
{ok, {{one_for_one, 10, 10},
[{delegate:server(Hash), {delegate, start_link, [Hash]},
- temporary, 16#ffffffff, worker, [delegate]} ||
+ transient, 16#ffffffff, worker, [delegate]} ||
Hash <- lists:seq(1, ?DELEGATE_PROCESSES)]}}.
%%--------------------------------------------------------------------
diff --git a/src/rabbit.erl b/src/rabbit.erl
index c3698759..e7bff270 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -93,7 +93,7 @@
-rabbit_boot_step({delegate_sup,
[{description, "cluster delegate"},
- {mfa, {rabbit_sup, start_restartable_child,
+ {mfa, {rabbit_sup, start_child,
[delegate_sup]}},
{requires, kernel_ready},
{enables, core_initialized}]}).