diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 16 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 8 |
2 files changed, 11 insertions, 13 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index dd1cec2fb6..d4b21c43ac 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 9aeb16216b..d7d1ff1483 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. |