summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-08-13 13:39:38 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-08-13 13:39:38 +0100
commit0f886f8d612ba00badf418a86f5e064f509901ca (patch)
treeed637ee818c947d8ae5c897ca113e0eb4cf891e2
parentbca2e20dc6dad9f99d5fd21ce207c97d7614cea4 (diff)
downloadrabbitmq-server-git-0f886f8d612ba00badf418a86f5e064f509901ca.tar.gz
Don't break rabbitmqctl remove_cluster_node --offline.
-rw-r--r--src/rabbit_log.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/rabbit_log.erl b/src/rabbit_log.erl
index f60336a182..2ca5260c12 100644
--- a/src/rabbit_log.erl
+++ b/src/rabbit_log.erl
@@ -61,7 +61,12 @@ error(Fmt) -> log(default, error, Fmt).
error(Fmt, Args) -> log(default, error, Fmt, Args).
catlevel(Category) ->
- {ok, CatLevelList} = application:get_env(rabbit, log_levels),
+ %% We can get here as part of rabbitmqctl when it is impersonating
+ %% a node; in which case the env will not be defined.
+ CatLevelList = case application:get_env(rabbit, log_levels) of
+ {ok, L} -> L;
+ undefined -> []
+ end,
level(proplists:get_value(Category, CatLevelList, info)).
%%--------------------------------------------------------------------