diff options
| author | Michael Klishin <michael@novemberain.com> | 2016-12-06 16:18:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-06 16:18:16 +0300 |
| commit | b37686c46b474d34d287bb863989eb6effc8020b (patch) | |
| tree | 35f86913d2334a3edf7b29c441c919f4ab142124 | |
| parent | e82c0641eebd2b542ec5d1aefa9eff3b371128d5 (diff) | |
| parent | d16b7347f416e1edba03b49890780535280995b9 (diff) | |
| download | rabbitmq-server-git-b37686c46b474d34d287bb863989eb6effc8020b.tar.gz | |
Merge pull request #1051 from rabbitmq/rabbitmq-server-1050
Coerce default_* configuration entries to binaries
| -rw-r--r-- | src/rabbit.erl | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 4a7a69eb62..8bee53d5ff 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -777,14 +777,25 @@ insert_default_data() -> {ok, DefaultVHost} = application:get_env(default_vhost), {ok, [DefaultConfigurePerm, DefaultWritePerm, DefaultReadPerm]} = application:get_env(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), - ok = rabbit_auth_backend_internal:set_permissions(DefaultUser, - DefaultVHost, - DefaultConfigurePerm, - DefaultWritePerm, - DefaultReadPerm), + + DefaultUserBin = rabbit_data_coercion:to_binary(DefaultUser), + DefaultPassBin = rabbit_data_coercion:to_binary(DefaultPass), + DefaultVHostBin = rabbit_data_coercion:to_binary(DefaultVHost), + DefaultConfigurePermBin = rabbit_data_coercion:to_binary(DefaultConfigurePerm), + DefaultWritePermBin = rabbit_data_coercion:to_binary(DefaultWritePerm), + DefaultReadPermBin = rabbit_data_coercion:to_binary(DefaultReadPerm), + + ok = rabbit_vhost:add(DefaultVHostBin), + ok = rabbit_auth_backend_internal:add_user( + DefaultUserBin, + DefaultPassBin + ), + ok = rabbit_auth_backend_internal:set_tags(DefaultUserBin,DefaultTags), + ok = rabbit_auth_backend_internal:set_permissions(DefaultUserBin, + DefaultVHostBin, + DefaultConfigurePermBin, + DefaultWritePermBin, + DefaultReadPermBin), ok. %%--------------------------------------------------------------------------- |