diff options
| author | Vlad Ionescu <vlad@lshift.net> | 2009-09-22 13:45:10 +0100 |
|---|---|---|
| committer | Vlad Ionescu <vlad@lshift.net> | 2009-09-22 13:45:10 +0100 |
| commit | 8671674d89d11173f260b67185060aed8ed6d14e (patch) | |
| tree | 24118fba75cdeb9b5f5619715441c42c12a168f7 | |
| parent | 078735c3b9379317f8f9153d20ba2a25c7c68e7d (diff) | |
| download | rabbitmq-server-8671674d89d11173f260b67185060aed8ed6d14e.tar.gz | |
renaming expl to explanation in #amqp_error{}
| -rw-r--r-- | include/rabbit.hrl | 8 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 84a1d4f7..c95ce738 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -67,7 +67,7 @@ -record(ssl_socket, {tcp, ssl}). -record(delivery, {mandatory, immediate, txn, sender, message}). --record(amqp_error, {name, expl, method = none}). +-record(amqp_error, {name, explanation, method = none}). %%---------------------------------------------------------------------------- @@ -157,9 +157,9 @@ -type(not_found() :: {'error', 'not_found'}). -type(routing_result() :: 'routed' | 'unroutable' | 'not_delivered'). -type(amqp_error() :: - #amqp_error{name :: atom(), - expl :: string(), - method :: atom()}). + #amqp_error{name :: atom(), + explanation :: string(), + method :: atom()}). -endif. %%---------------------------------------------------------------------------- diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 7e15dfe8..58431438 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -148,7 +148,7 @@ frame_error(MethodName, BinaryFields) -> amqp_error(Name, ExplanationFormat, Params, Method) -> Explanation = lists:flatten(io_lib:format(ExplanationFormat, Params)), - #amqp_error{name = Name, expl = Explanation, method = Method}. + #amqp_error{name = Name, explanation = Explanation, method = Method}. protocol_error(Name, ExplanationFormat, Params) -> protocol_error(Name, ExplanationFormat, Params, none). diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index cb59d7dc..677144a5 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -792,7 +792,7 @@ map_exception(Channel, Reason) -> {ShouldClose, CloseChannel, CloseMethod}. lookup_amqp_exception( - #amqp_error{name = Name, expl = Expl, method = Method}) -> + #amqp_error{name = Name, explanation = Expl, method = Method}) -> {ShouldClose, Code, Text} = rabbit_framing:lookup_amqp_exception(Name), ExplBin = list_to_binary(Expl), CompleteTextBin = <<Text/binary, " - ", ExplBin/binary>>, |