summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-09-20 16:01:55 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-09-20 16:01:55 +0100
commitb39f33cb61320c07968b7c0ecb345af3fc7bdd8c (patch)
tree69dfdb57cd05bea669513c47738b2e30cddc2498 /src
parent38d108f164be01c93d6584df5d2a8e42b675d46f (diff)
downloadrabbitmq-server-git-b39f33cb61320c07968b7c0ecb345af3fc7bdd8c.tar.gz
reorder boot script so that rabbit:prepare/0 gets called *after* sasl is started
Otherwise, the SASL application is started after and installs its error handlers (which prepare should have replaced).
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_prelaunch.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl
index 9fe073d997..f99500ddd8 100644
--- a/src/rabbit_prelaunch.erl
+++ b/src/rabbit_prelaunch.erl
@@ -216,7 +216,11 @@ post_process_script(ScriptFile) ->
end.
process_entry(Entry = {apply,{application,start_boot,[mnesia,permanent]}}) ->
- [{apply,{rabbit,prepare,[]}}, Entry];
+ [{apply,{application,start_boot,[sasl,permanent]}},
+ {apply,{rabbit,prepare,[]}},
+ Entry];
+process_entry(Entry = {application,start_boot,[sasl,permanent]}) ->
+ [];
process_entry(Entry) ->
[Entry].