diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2014-03-12 17:11:03 +0000 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2014-03-12 17:11:03 +0000 |
commit | b0b5617319f484cc87564e1b15245b2d6be3bcdd (patch) | |
tree | 6f7bf8307d4d9d1362850869a1d470ddcb7e53cc | |
parent | f3576738879eee8e4fba089a5f754246724b5adf (diff) | |
download | rabbitmq-server-b0b5617319f484cc87564e1b15245b2d6be3bcdd.tar.gz |
Log the config file's expected location according to the environment varible if it cannot be found.bug26065
-rwxr-xr-x | scripts/rabbitmq-server | 2 | ||||
-rw-r--r-- | src/rabbit.erl | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index b430eec3..72811adc 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -81,6 +81,8 @@ case "$(uname -s)" in fi esac +export RABBITMQ_CONFIG_FILE + RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin" if ! ${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \ -boot "${CLEAN_BOOT_FILE}" \ diff --git a/src/rabbit.erl b/src/rabbit.erl index bd4f1dbc..fda3f516 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -776,11 +776,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 |