diff options
| author | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-06-24 23:31:48 +0100 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-06-24 23:31:48 +0100 |
| commit | 534d0faae75ee774dfae6a7e378bba2351f9a7f8 (patch) | |
| tree | 0b50116a200ef755f9e6a43cc56b8986fcde8795 /src/rabbit.erl | |
| parent | 31d8836db7122d72f4be162246f5c20ba111669c (diff) | |
| parent | da5a1fd5b839d2ccbf83f17d618aae2184731ece (diff) | |
| download | rabbitmq-server-git-534d0faae75ee774dfae6a7e378bba2351f9a7f8.tar.gz | |
Merge default into amqp_0_9_1
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 1ddb515173..196212eaee 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -136,7 +136,7 @@ start(normal, []) -> ok = rabbit_amqqueue:start(), - {ok, MemoryAlarms} = application:get_env(memory_alarms), + {ok, MemoryAlarms} = application:get_env(memory_alarms), ok = rabbit_alarm:start(MemoryAlarms), ok = rabbit_binary_generator: @@ -304,7 +304,7 @@ rotate_logs(File, Suffix, OldHandler, NewHandler) -> log_rotation_result({error, MainLogError}, {error, SaslLogError}) -> {error, {{cannot_rotate_main_logs, MainLogError}, - {cannot_rotate_sasl_logs, SaslLogError}}}; + {cannot_rotate_sasl_logs, SaslLogError}}}; log_rotation_result({error, MainLogError}, ok) -> {error, {cannot_rotate_main_logs, MainLogError}}; log_rotation_result(ok, {error, SaslLogError}) -> |