diff options
| author | Matthias Radestock <matthias@lshift.net> | 2008-11-28 20:33:51 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2008-11-28 20:33:51 +0000 |
| commit | 3d680ec39530033e9cde3ea48effc8fe5da4efd8 (patch) | |
| tree | 0bf145612f4ff0492a94b791ea50442084f23621 | |
| parent | 02edf32d35213696384f91883325c06b4540cdb0 (diff) | |
| download | rabbitmq-server-3d680ec39530033e9cde3ea48effc8fe5da4efd8.tar.gz | |
rename ensure_directory_exists to ensure_parent_dirs_exist
since that is a better descript of what actually happens.
Similarly, change the exception tag
| -rw-r--r-- | src/rabbit_error_logger_file_h.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_sasl_report_file_h.erl | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/rabbit_error_logger_file_h.erl b/src/rabbit_error_logger_file_h.erl index c3bdd520..7f7f77f5 100644 --- a/src/rabbit_error_logger_file_h.erl +++ b/src/rabbit_error_logger_file_h.erl @@ -54,10 +54,10 @@ init({{File, _}, error}) -> init({File, []}) -> init(File); init({File, _Type} = FileInfo) -> - rabbit_misc:ensure_directory_exists(File), + rabbit_misc:ensure_parent_dirs_exist(File), error_logger_file_h:init(FileInfo); init(File) -> - rabbit_misc:ensure_directory_exists(File), + rabbit_misc:ensure_parent_dirs_exist(File), error_logger_file_h:init(File). handle_event(Event, State) -> diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 02f519bd..cdd80594 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -42,7 +42,7 @@ -export([intersperse/2, upmap/2, map_in_order/2]). -export([guid/0, string_guid/1, binstring_guid/1]). -export([dirty_read_all/1, dirty_foreach_key/2, dirty_dump_log/1]). --export([append_file/2, ensure_directory_exists/1]). +-export([append_file/2, ensure_parent_dirs_exist/1]). -import(mnesia). -import(lists). @@ -98,7 +98,7 @@ 'ok' | 'aborted'). -spec(dirty_dump_log/1 :: (string()) -> 'ok' | {'error', any()}). -spec(append_file/2 :: (string(), string()) -> 'ok' | {'error', any()}). --spec(ensure_directory_exists/1 :: (string()) -> 'ok'). +-spec(ensure_parent_dirs_exist/1 :: (string()) -> 'ok'). -endif. @@ -371,9 +371,9 @@ append_file(File, _, Suffix) -> Error -> Error end. -ensure_directory_exists(Filename) -> +ensure_parent_dirs_exist(Filename) -> case filelib:ensure_dir(Filename) of ok -> ok; {error, Reason} -> - throw({error, {cannot_create_directory, Filename, Reason}}) + throw({error, {cannot_create_parent_dirs, Filename, Reason}}) end. diff --git a/src/rabbit_sasl_report_file_h.erl b/src/rabbit_sasl_report_file_h.erl index 0c5a29f0..e2385d83 100644 --- a/src/rabbit_sasl_report_file_h.erl +++ b/src/rabbit_sasl_report_file_h.erl @@ -55,10 +55,10 @@ init({{File, _}, error}) -> init({File, []}) -> init(File); init({File, _Type} = FileInfo) -> - rabbit_misc:ensure_directory_exists(File), + rabbit_misc:ensure_parent_dirs_exist(File), sasl_report_file_h:init(FileInfo); init(File) -> - rabbit_misc:ensure_directory_exists(File), + rabbit_misc:ensure_parent_dirs_exist(File), sasl_report_file_h:init({File, sasl_error_logger_type()}). handle_event(Event, State) -> |