summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert@lshift.net>2008-08-27 11:00:20 +0100
committerHubert Plociniczak <hubert@lshift.net>2008-08-27 11:00:20 +0100
commite0bee37888a96a92d2fad7da9e9ee2d6456f99c6 (patch)
treed411f63eac0e033ac4204b7f1da2fd69ce653732
parent475a336f0982fb1f433990ca4b2e98c331ba720a (diff)
downloadrabbitmq-server-e0bee37888a96a92d2fad7da9e9ee2d6456f99c6.tar.gz
Minor style changes
-rw-r--r--src/rabbit.erl16
-rw-r--r--src/rabbit_misc.erl8
2 files changed, 11 insertions, 13 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index dd1cec2f..d4b21c43 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -261,15 +261,13 @@ ensure_working_log_config() ->
_Filename -> ok
end.
-error_log_location(default) ->
- case error_logger:logfile(filename) of
- {error,no_log_file} -> tty;
- File -> File
- end;
-error_log_location(wrapper) ->
- case gen_event:call(error_logger, rabbit_error_logger_file_h, filename) of
- {error,no_log_file} -> tty;
- File -> File
+error_log_location(Type) ->
+ case case Type of
+ default -> error_logger:logfile(filename);
+ wrapper -> gen_event:call(error_logger, rabbit_error_logger_file_h, filename)
+ end of
+ {error, no_log_file} -> tty;
+ File -> File
end.
sasl_log_location() ->
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 9aeb1621..d7d1ff14 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -342,7 +342,7 @@ append_file(File, Suffix) ->
case catch file:read_file_info(File) of
{ok, FInfo} -> append_file(File, FInfo#file_info.size, Suffix);
{error, enoent} -> ok;
- {error, Error} -> {error, {cannot_read_logfile, Error}}
+ Error -> Error
end.
append_file(_, 0, _) ->
@@ -350,7 +350,7 @@ append_file(_, 0, _) ->
append_file(_, _, "") ->
ok;
append_file(File, _, Suffix) ->
- case catch file:read_file(File) of
- {ok, Data} -> file:write_file([File, Suffix], Data, [append]);
- {error, Error} -> {error, {cannot_append_logfile, Error}}
+ case file:read_file(File) of
+ {ok, Data} -> file:write_file([File, Suffix], Data, [append]);
+ Error -> Error
end.