diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-21 17:13:26 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-21 17:13:26 +0100 |
| commit | 617bf6e64470e7946e6a355b88e0d67c2054d539 (patch) | |
| tree | 5845341ea0744f5195824da615a273c34ea659bc /include | |
| parent | 5cfa6ee0d45225df5b14ea51e8003aa9f551e873 (diff) | |
| parent | 7428f95d69a819bf809d9c22156a64d4032cbcf9 (diff) | |
| download | rabbitmq-server-git-617bf6e64470e7946e6a355b88e0d67c2054d539.tar.gz | |
Merging default into bug 19844 (debitrotting)
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 38142491ff..552aec6726 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -62,7 +62,8 @@ -record(listener, {node, protocol, host, port}). --record(basic_message, {exchange_name, routing_key, content, persistent_key}). +-record(basic_message, {exchange_name, routing_key, content, guid, + is_persistent}). -record(ssl_socket, {tcp, ssl}). -record(delivery, {mandatory, immediate, txn, sender, message}). @@ -83,6 +84,7 @@ -type(info_key() :: atom()). -type(info() :: {info_key(), any()}). -type(regexp() :: binary()). +-type(file_path() :: string()). %% this is really an abstract type, but dialyzer does not support them -type(guid() :: any()). @@ -144,7 +146,8 @@ #basic_message{exchange_name :: exchange_name(), routing_key :: routing_key(), content :: content(), - persistent_key :: maybe(pkey())}). + guid :: guid(), + is_persistent :: boolean()}). -type(message() :: basic_message()). -type(delivery() :: #delivery{mandatory :: boolean(), @@ -154,7 +157,7 @@ message :: message()}). %% this really should be an abstract type -type(msg_id() :: non_neg_integer()). --type(msg() :: {queue_name(), pid(), msg_id(), boolean(), message()}). +-type(qmsg() :: {queue_name(), pid(), msg_id(), boolean(), message()}). -type(listener() :: #listener{node :: erlang_node(), protocol :: atom(), @@ -166,6 +169,7 @@ #amqp_error{name :: atom(), explanation :: string(), method :: atom()}). + -endif. %%---------------------------------------------------------------------------- @@ -175,6 +179,9 @@ -define(MAX_WAIT, 16#ffffffff). +-define(HIBERNATE_AFTER_MIN, 1000). +-define(DESIRED_HIBERNATE, 10000). + -ifdef(debug). -define(LOGDEBUG0(F), rabbit_log:debug(F)). -define(LOGDEBUG(F,A), rabbit_log:debug(F,A)). |