diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2015-01-12 18:26:37 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2015-01-12 18:26:37 +0000 |
| commit | 30cb8584d7c5d9388bd024758629526aa9f775cb (patch) | |
| tree | ce575ba1d6f2a93b738f901703d781b6ba3a9ae2 | |
| parent | 266bafc71c7996e941c28e2d045f2efb5eae4a7a (diff) | |
| parent | 814b54783e326508bcbdce7b6ba251c782b9b1a9 (diff) | |
| download | rabbitmq-server-git-30cb8584d7c5d9388bd024758629526aa9f775cb.tar.gz | |
Merge bug26327
| -rw-r--r-- | src/rabbit_variable_queue.erl | 2 | ||||
| -rw-r--r-- | src/truncate.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index a0f14b0ab4..8a1e52cfcd 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1414,7 +1414,7 @@ determine_persist_to(Msg, #message_properties{size = Size}) -> %% anyway. case Size >= IndexMaxSize of true -> msg_store; - false -> case size(term_to_binary(Msg)) >= IndexMaxSize of + false -> case truncate:term_limit(Msg, IndexMaxSize) of true -> msg_store; false -> queue_index end diff --git a/src/truncate.erl b/src/truncate.erl index 820af1bf86..3e180a3aa7 100644 --- a/src/truncate.erl +++ b/src/truncate.erl @@ -20,7 +20,7 @@ -record(params, {content, struct, content_dec, struct_dec}). --export([log_event/2, term/2]). +-export([log_event/2, term/2, term_limit/2]). %% exported for testing -export([test/0]). |