diff options
| author | Tim Watson <watson.timothy@gmail.com> | 2014-02-21 12:50:14 +0000 |
|---|---|---|
| committer | Tim Watson <watson.timothy@gmail.com> | 2014-02-21 12:50:14 +0000 |
| commit | 41477f4c37db75e85fd19830fbc3fbed7bb3a13a (patch) | |
| tree | 44c78e518e26d95008e854f0923415c2795cde87 | |
| parent | e9e54f327d0139a9e0dfa53858767308ac3dea8f (diff) | |
| download | rabbitmq-server-git-41477f4c37db75e85fd19830fbc3fbed7bb3a13a.tar.gz | |
Simply application:get_env calls and reduce distance to default again
| -rw-r--r-- | src/rabbit.erl | 10 | ||||
| -rw-r--r-- | src/rabbit_alarm.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index adfb934e0a..f2aa18a322 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -640,12 +640,12 @@ maybe_insert_default_data() -> end. insert_default_data() -> - {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, 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, [DefaultConfigurePerm, DefaultWritePerm, DefaultReadPerm]} = - application:get_env(rabbit, default_permissions), + 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), diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl index ac2fb42f11..cd1d125bd5 100644 --- a/src/rabbit_alarm.erl +++ b/src/rabbit_alarm.erl @@ -53,8 +53,7 @@ start_link() -> start() -> ok = rabbit_sup:start_restartable_child(?MODULE), ok = gen_event:add_handler(?SERVER, ?MODULE, []), - {ok, MemoryWatermark} = application:get_env(rabbit, - vm_memory_high_watermark), + {ok, MemoryWatermark} = application:get_env(vm_memory_high_watermark), rabbit_sup:start_restartable_child( vm_memory_monitor, [MemoryWatermark, fun (Alarm) -> @@ -62,8 +61,7 @@ start() -> set_alarm(Alarm) end, fun clear_alarm/1]), - {ok, DiskLimit} = application:get_env(rabbit, - disk_free_limit), + {ok, DiskLimit} = application:get_env(disk_free_limit), rabbit_sup:start_restartable_child(rabbit_disk_monitor, [DiskLimit]), ok. diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index b1016df1ef..42438790c0 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -125,12 +125,12 @@ boot() -> ok = boot_ssl(). boot_tcp() -> - {ok, TcpListeners} = application:get_env(rabbit, tcp_listeners), + {ok, TcpListeners} = application:get_env(tcp_listeners), [ok = start_tcp_listener(Listener) || Listener <- TcpListeners], ok. boot_ssl() -> - case application:get_env(rabbit, ssl_listeners) of + case application:get_env(ssl_listeners) of {ok, []} -> ok; {ok, SslListeners} -> |