summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-10-31 12:05:50 +0000
committerSimon MacMullen <simon@rabbitmq.com>2013-10-31 12:05:50 +0000
commit590b8d0b8aa1a4f45e1739f95f4c9ebe32f80678 (patch)
tree0b7590f3dcd00775c84e280d2391549806b0c00e
parente8965a5f5529e4a09e97a8b7e6c18cc9cdd00071 (diff)
downloadrabbitmq-server-590b8d0b8aa1a4f45e1739f95f4c9ebe32f80678.tar.gz
Simplify
-rw-r--r--src/rabbit_upgrade_functions.erl17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/rabbit_upgrade_functions.erl b/src/rabbit_upgrade_functions.erl
index d7613322..2886f919 100644
--- a/src/rabbit_upgrade_functions.erl
+++ b/src/rabbit_upgrade_functions.erl
@@ -343,18 +343,17 @@ queue_decorators(Table) ->
sync_slave_pids, policy, gm_pids, decorators]).
internal_trace_log() ->
- Xs = [<<"amq.rabbitmq.log">>, <<"amq.rabbitmq.trace">>],
transform(
rabbit_durable_exchange,
- fun ({exchange, Name = {resource, _, _, NameBin}, Type, Dur, AutoDel,
- Int0, Args, Scratches, Policy, Decorators}) ->
- Int = case lists:member(NameBin, Xs) of
- true -> true;
- false -> Int0
- end,
- {exchange, Name, Type, Dur, AutoDel, Int, Args, Scratches, Policy,
- Decorators}
+ fun ({exchange, Name = {resource, _, _, <<"amq.rabbitmq.", _/binary>>},
+ Type, Dur, AutoDel, _Int, Args, Scratches, Policy, Decorators}) ->
+ {exchange, Name, Type, Dur, AutoDel, true, Args, Scratches,
+ Policy, Decorators};
+ (X) ->
+ X
+
end,
+
[name, type, durable, auto_delete, internal, arguments, scratches, policy,
decorators]).