summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-02-24 12:53:43 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2012-02-24 12:53:43 +0000
commit5fdc5eed5c52519660de45bccc471139bae9f0c1 (patch)
tree50cd79716be70cb2805bb543aecb1b2047deae47
parent07d53486fe266a6269aab08f1c8f6fc99ea8a577 (diff)
downloadrabbitmq-server-5fdc5eed5c52519660de45bccc471139bae9f0c1.tar.gz
fix hidden bug in config file listing
see docs for init:get_argument/1 - a single "-config <file>" argument comes back as [[<file>]], multiple come back as [[<file>], ...]. The reason the previous code worked is that the functions in 'filename' accept deep lists. NB: we are not handling the case of "-config <file> <file> ...", but then neither does the application_controller, and th docs for 'erl' only mention a single file.
-rw-r--r--src/rabbit.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index a94af4ec..dd5fb89c 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -714,6 +714,6 @@ config_files() ->
case init:get_argument(config) of
{ok, Files} -> [filename:absname(
filename:rootname(File, ".config") ++ ".config") ||
- File <- Files];
+ [File] <- Files];
error -> []
end.