summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorTim Watson <watson.timothy@gmail.com>2013-11-20 12:13:05 +0000
committerTim Watson <watson.timothy@gmail.com>2013-11-20 12:13:05 +0000
commitbc371b7de17216b213ac3ef3638b42d31fcc7b79 (patch)
treec8ccb6a04efc835a5d59467449ca4b87be2598d6 /src/rabbit.erl
parent3f557dc14fc766f50e371a469aa092767acb98e3 (diff)
downloadrabbitmq-server-git-bc371b7de17216b213ac3ef3638b42d31fcc7b79.tar.gz
Various boot procedure improvements
We ensure that all dependent applications are stopped, but also that dependencies shared by multiple applications (e.g., amqp_client) are not.
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 74efbf22d7..44cd275d3b 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -457,12 +457,12 @@ maybe_insert_default_data() ->
end.
insert_default_data() ->
- {ok, DefaultUser} = application:get_env(default_user),
- {ok, DefaultPass} = application:get_env(default_pass),
- {ok, DefaultTags} = application:get_env(default_user_tags),
- {ok, DefaultVHost} = application:get_env(default_vhost),
+ {ok, DefaultUser} = application:get_env(rabbit, default_user),
+ {ok, DefaultPass} = application:get_env(rabbit, default_pass),
+ {ok, DefaultTags} = application:get_env(rabbit, default_user_tags),
+ {ok, DefaultVHost} = application:get_env(rabbit, default_vhost),
{ok, [DefaultConfigurePerm, DefaultWritePerm, DefaultReadPerm]} =
- application:get_env(default_permissions),
+ application:get_env(rabbit, default_permissions),
ok = rabbit_vhost:add(DefaultVHost),
ok = rabbit_auth_backend_internal:add_user(DefaultUser, DefaultPass),
ok = rabbit_auth_backend_internal:set_tags(DefaultUser, DefaultTags),