log.rabbit => log.exchange

We already have log.file, log.syslog. "rabbit" is not really
a logging mechanism.

2 files changed, 11 insertions, 11 deletions

diff --git a/src/lager_rabbit_backend.erl b/src/lager_exchange_backend.erl
index 87c0c6be8d..20ed88bc47 100644
--- a/src/lager_rabbit_backend.erl
+++ b/src/lager_exchange_backend.erl
@@ -24,7 +24,7 @@
 %%                             `time [ severity ] message'</li>
 %% </ul>
 
--module(lager_rabbit_backend).
+-module(lager_exchange_backend).
 
 -behaviour(gen_event).
 
@@ -56,7 +56,7 @@
 -define(DEPRECATED(_Msg), ok).
 -else.
 -define(DEPRECATED(Msg),
-        io:format(user, "WARNING: This is a deprecated lager_rabbit_backend configuration. Please use \"~w\" instead.~n", [Msg])).
+        io:format(user, "WARNING: This is a deprecated lager_exchange_backend configuration. Please use \"~w\" instead.~n", [Msg])).
 -endif.
 
 -define(LOG_EXCH_NAME, <<"amq.rabbitmq.log">>).
@@ -92,7 +92,7 @@ init(Level) when is_atom(Level) ->
     ?DEPRECATED([{level, Level}]),
     init([{level, Level}]);
 init(Other) ->
-    {error, {fatal, {bad_lager_rabbit_backend_config, Other}}}.
+    {error, {fatal, {bad_lager_exchange_backend_config, Other}}}.
 
 validate_options([]) -> true;
 validate_options([{level, L}|T]) when is_atom(L) ->
@@ -107,7 +107,7 @@ validate_options([{formatter, M}|T]) when is_atom(M) ->
 validate_options([{formatter_config, C}|T]) when is_list(C) ->
     validate_options(T);
 validate_options([H|_]) ->
-    throw({error, {fatal, {bad_lager_rabbit_backend_config, H}}}).
+    throw({error, {fatal, {bad_lager_exchange_backend_config, H}}}).
 
 get_option(K, Options, Default) ->
    case lists:keyfind(K, 1, Options) of
@@ -216,7 +216,7 @@ console_config_validation_test_() ->
     [
      ?_assertEqual(true, validate_options(Good)),
      ?_assertThrow({error, {fatal, {bad_level, foo}}}, validate_options(Bad1)),
-     ?_assertThrow({error, {fatal, {bad_lager_rabbit_backend_config, {larval, info}}}}, validate_options(Bad2)),
+     ?_assertThrow({error, {fatal, {bad_lager_exchange_backend_config, {larval, info}}}}, validate_options(Bad2)),
      ?_assertEqual(true, validate_options(AllGood))
     ].
 -endif.
diff --git a/src/rabbit_lager.erl b/src/rabbit_lager.erl
index 13b77007f2..b55d6a173a 100644
--- a/src/rabbit_lager.erl
+++ b/src/rabbit_lager.erl
@@ -263,7 +263,7 @@ generate_lager_handlers(LogHandlersConfig) ->
                     generate_handler(Backend, HandlerConfig)
             end;
         ({Other, HandlerConfig}) when
-              Other =:= console; Other =:= syslog; Other =:= rabbit ->
+              Other =:= console; Other =:= syslog; Other =:= exchange ->
             case proplists:get_value(enabled, HandlerConfig, false) of
                 false -> [];
                 true  ->
@@ -274,10 +274,10 @@ generate_lager_handlers(LogHandlersConfig) ->
     end,
     LogHandlersConfig).
 
-lager_backend(file) -> lager_file_backend;
-lager_backend(console) -> lager_console_backend;
-lager_backend(syslog) -> lager_syslog_backend;
-lager_backend(rabbit) -> lager_rabbit_backend.
+lager_backend(file)     -> lager_file_backend;
+lager_backend(console)  -> lager_console_backend;
+lager_backend(syslog)   -> lager_syslog_backend;
+lager_backend(exchange) -> lager_exchange_backend.
 
 generate_handler(Backend, HandlerConfig) ->
     [{Backend,
@@ -292,7 +292,7 @@ default_handler_config(lager_syslog_backend) ->
 default_handler_config(lager_console_backend) ->
     [{level, default_config_value(level)},
      {formatter_config, default_config_value(formatter_config)}];
-default_handler_config(lager_rabbit_backend) ->
+default_handler_config(lager_exchange_backend) ->
     [{level, default_config_value(level)},
      {formatter_config, default_config_value(formatter_config)}];
 default_handler_config(lager_file_backend) ->