diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-07 13:46:52 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-07 13:46:52 +0100 |
| commit | 35cd02d2583bcc05c1fb522f064373571e7fee62 (patch) | |
| tree | 7189694fbcb86eb3bd3e933230348223bae041f5 | |
| parent | 38cd8697f0105f8ced1f7a5922e5b525ba12f52d (diff) | |
| download | rabbitmq-server-35cd02d2583bcc05c1fb522f064373571e7fee62.tar.gz | |
patch filelib2 so that it uses file2
| -rw-r--r-- | src/filelib2.erl | 11 | ||||
| -rw-r--r-- | src/rabbit_prelaunch.erl | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/filelib2.erl b/src/filelib2.erl index d532cea1..146496f4 100644 --- a/src/filelib2.erl +++ b/src/filelib2.erl @@ -1,3 +1,6 @@ +%% This is a version of 'filelib' from R14B03, which uses 'file2' +%% instead of 'file'. + %% %% %CopyrightBegin% %% @@ -16,7 +19,7 @@ %% %% %CopyrightEnd% --module(filelib). +-module(filelib2). %% File utilities. @@ -266,7 +269,7 @@ ensure_dir(F) -> ok; false -> ensure_dir(Dir), - case file:make_dir(Dir) of + case file2:make_dir(Dir) of {error,eexist}=EExist -> case do_is_dir(Dir, file) of true -> @@ -478,7 +481,7 @@ error(Reason) -> erlang:error({badpattern,Reason}). eval_read_file_info(File, file) -> - file:read_file_info(File); + file2:read_file_info(File); eval_read_file_info(File, erl_prim_loader) -> case erl_prim_loader:read_file_info(File) of error -> {error, erl_prim_loader}; @@ -488,7 +491,7 @@ eval_read_file_info(File, Mod) -> Mod:read_file_info(File). eval_list_dir(Dir, file) -> - file:list_dir(Dir); + file2:list_dir(Dir); eval_list_dir(Dir, erl_prim_loader) -> case erl_prim_loader:list_dir(Dir) of error -> {error, erl_prim_loader}; diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl index 35ffba0f..bbbea543 100644 --- a/src/rabbit_prelaunch.erl +++ b/src/rabbit_prelaunch.erl @@ -37,7 +37,7 @@ start() -> io:format("Activating RabbitMQ plugins ...~n"), - %% Some of the rabbit_misc functions use worker_pool. + %% Some of the rabbit_misc functions use worker_pool, so start it now. worker_pool_sup:start_link(), %% Determine our various directories |