diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-03-26 12:21:21 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-03-26 12:21:21 +0100 |
| commit | 47ef081300486551ebc07954b21bb0e329a12058 (patch) | |
| tree | 48d943ee2130ec6131cffe222e974a8e25827e8e /src | |
| parent | 632059acb473b0b2d64d01bc551449d615b6d37c (diff) | |
| download | rabbitmq-server-git-47ef081300486551ebc07954b21bb0e329a12058.tar.gz | |
rabbit_dead_letter.erl: Fix shadowing of variable 'Info'
While here, wrap long lines to fit 80 columns.
References #78.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_dead_letter.erl | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/rabbit_dead_letter.erl b/src/rabbit_dead_letter.erl index a6daeafbb5..010288024b 100644 --- a/src/rabbit_dead_letter.erl +++ b/src/rabbit_dead_letter.erl @@ -92,18 +92,24 @@ update_x_death_header(Info, Headers) -> rabbit_basic:prepend_table_header(<<"x-death">>, [{<<"count">>, long, 1} | Info], Headers); {<<"x-death">>, array, Tables} -> - {Matches, Others} = lists:partition(fun ({table, Info}) -> - x_death_event_key(Info, <<"queue">>, longstr) =:= Q - andalso x_death_event_key(Info, <<"reason">>, longstr) =:= R - end, Tables), - Info1 = case Matches of - [] -> [{<<"count">>, long, 1} | Info]; - [{table, M}] -> - case x_death_event_key(M, <<"count">>, long) of - undefined -> [{<<"count">>, long, 1} | M]; - N -> lists:keyreplace(<<"count">>, 1, M, {<<"count">>, long, N + 1}) - end - end, + {Matches, Others} = lists:partition( + fun ({table, Info0}) -> + x_death_event_key(Info0, <<"queue">>, longstr) =:= Q + andalso x_death_event_key(Info0, <<"reason">>, longstr) =:= R + end, Tables), + Info1 = case Matches of + [] -> + [{<<"count">>, long, 1} | Info]; + [{table, M}] -> + case x_death_event_key(M, <<"count">>, long) of + undefined -> + [{<<"count">>, long, 1} | M]; + N -> + lists:keyreplace( + <<"count">>, 1, M, + {<<"count">>, long, N + 1}) + end + end, rabbit_misc:set_table_value(Headers, <<"x-death">>, array, [{table, rabbit_misc:sort_field_table(Info1)} | Others]) end. |