diff options
author | Tim Watson <tim@rabbitmq.com> | 2014-03-14 16:32:55 +0000 |
---|---|---|
committer | Tim Watson <tim@rabbitmq.com> | 2014-03-14 16:32:55 +0000 |
commit | ce5374586fe10aea98d5e0bbc56827b651021703 (patch) | |
tree | 504ace3768b77ebda3427bfd9630905430e04472 /src/rabbit.erl | |
parent | 2aeb2d0cefa24540aa5b6e902ed89a7b48ee4400 (diff) | |
parent | 3ca3828bff17ec60859160cb0b8251f02e40cb07 (diff) | |
download | rabbitmq-server-ce5374586fe10aea98d5e0bbc56827b651021703.tar.gz |
Merge default into bug24926
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r-- | src/rabbit.erl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index c703fedb..062b9355 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -867,11 +867,15 @@ home_dir() -> end. config_files() -> + Abs = fun (F) -> + filename:absname(filename:rootname(F, ".config") ++ ".config") + end, case init:get_argument(config) of - {ok, Files} -> [filename:absname( - filename:rootname(File, ".config") ++ ".config") || - [File] <- Files]; - error -> [] + {ok, Files} -> [Abs(File) || [File] <- Files]; + error -> case os:getenv("RABBITMQ_CONFIG_FILE") of + false -> []; + File -> [Abs(File) ++ " (not found)"] + end end. %% We don't want this in fhc since it references rabbit stuff. And we can't put |