diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-03-31 13:25:42 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-03-31 13:25:42 +0100 |
| commit | fc53b92a0a00b4330366387ca61687e1e42256f9 (patch) | |
| tree | caca974dc2f003d9beb05dc7b640ca5edfea6cb7 /include | |
| parent | 63dcc9f6be8a3a76772fd6a24fcad36e9e48266d (diff) | |
| parent | b795aeb8dd38c59cdcf225f05a9b7dbd4eb4d76d (diff) | |
| download | rabbitmq-server-git-fc53b92a0a00b4330366387ca61687e1e42256f9.tar.gz | |
Merge bug26088
Diffstat (limited to 'include')
| -rw-r--r-- | include/gm_specs.hrl | 2 | ||||
| -rw-r--r-- | include/rabbit.hrl | 18 | ||||
| -rw-r--r-- | include/rabbit_msg_store.hrl | 2 |
3 files changed, 16 insertions, 6 deletions
diff --git a/include/gm_specs.hrl b/include/gm_specs.hrl index dc51f50e18..f4ea0df8b9 100644 --- a/include/gm_specs.hrl +++ b/include/gm_specs.hrl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved. +%% Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved. %% -ifdef(use_specs). diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 0f1b7a506b..26146d1d9e 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved. +%% Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved. %% -record(user, {username, @@ -60,7 +60,7 @@ -record(trie_node, {exchange_name, node_id}). -record(trie_edge, {exchange_name, node_id, word}). --record(trie_binding, {exchange_name, node_id, destination}). +-record(trie_binding, {exchange_name, node_id, destination, arguments}). -record(listener, {node, protocol, host, ip_address, port}). @@ -70,10 +70,10 @@ is_persistent}). -record(ssl_socket, {tcp, ssl}). --record(delivery, {mandatory, sender, message, msg_seq_no}). +-record(delivery, {mandatory, confirm, sender, message, msg_seq_no}). -record(amqp_error, {name, explanation = "", method = none}). --record(event, {type, props, timestamp}). +-record(event, {type, props, reference = undefined, timestamp}). -record(message_properties, {expiry, needs_confirming = false}). @@ -118,3 +118,13 @@ %% to allow plenty of leeway for the #basic_message{} and #content{} %% wrapping the message body). -define(MAX_MSG_SIZE, 2147383648). + +%% 1) Maximum size of printable lists and binaries. +%% 2) Maximum size of any structural term. +%% 3) Amount to decrease 1) every time we descend while truncating. +%% 4) Amount to decrease 2) every time we descend while truncating. +%% +%% Whole thing feeds into truncate:log_event/2. +-define(LOG_TRUNC, {2000, 100, 100, 7}). + +-define(store_proc_name(N), rabbit_misc:store_proc_name(?MODULE, N)). diff --git a/include/rabbit_msg_store.hrl b/include/rabbit_msg_store.hrl index da4fd83961..4e726b07ab 100644 --- a/include/rabbit_msg_store.hrl +++ b/include/rabbit_msg_store.hrl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved. +%% Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved. %% -include("rabbit.hrl"). |