diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-01-25 13:54:57 +0000 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-01-25 13:54:57 +0000 |
| commit | 43a6a8a8479094da447b708102a1cb454f8597fc (patch) | |
| tree | 3e48b16636087c48660478bac6514db5b139e283 | |
| parent | aa5d84bf10baa80fc8039bf262cc5b015820132e (diff) | |
| download | rabbitmq-server-43a6a8a8479094da447b708102a1cb454f8597fc.tar.gz | |
Better error messages and style fixes.
| -rw-r--r-- | src/rabbit_exchange.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_exchange_type_invalid.erl | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 5ae9acd3..a7b80c12 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -357,7 +357,7 @@ peek_serial(XName) -> invalid_module(T) -> rabbit_log:warning( - "Could not find exchange type ~p, using invalid exchange instead~n", [T]), + "could not find exchange type ~p.~n", [T]), put({xtype_to_module, T}, rabbit_exchange_type_invalid), rabbit_exchange_type_invalid. @@ -370,5 +370,6 @@ type_to_module(T) -> Module; {error, not_found} -> invalid_module(T) end; - Module -> Module + Module -> + Module end. diff --git a/src/rabbit_exchange_type_invalid.erl b/src/rabbit_exchange_type_invalid.erl index 5b4b8772..24fbb77d 100644 --- a/src/rabbit_exchange_type_invalid.erl +++ b/src/rabbit_exchange_type_invalid.erl @@ -25,15 +25,18 @@ -include("rabbit_exchange_type_spec.hrl"). description() -> - D = <<"Dummy exchange type, to be used when the intended one is not found">>, - [{name, <<"invalid">>}, {description, D}]. + [{name, <<"invalid">>}, + {description, + <<"Dummy exchange type, to be used when the intended one is not found">> + }]. serialise_events() -> false. -route(#exchange{name = Name}, _) -> +route(#exchange{name = Name, type = Type}, _) -> rabbit_misc:protocol_error( - command_invalid, "cannot route message through invalid ~s", - [rabbit_misc:rs(Name)]). + command_invalid, + "cannot route message through ~s, exchange type ~p not found", + [rabbit_misc:rs(Name), Type]). validate(_X) -> ok. create(_Tx, _X) -> ok. |