diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-08-04 09:53:26 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-08-04 09:53:26 +0100 |
| commit | a90903dc5061f7b3f97a8452225387994774e58c (patch) | |
| tree | ec1552ebaa20b0aa47addfbf2684623f343c48c4 /include | |
| parent | 2b47eed18f51c388204ce11d82afa7fcfb7b5a05 (diff) | |
| parent | 98831545b0205444b69de77bb617434714b3212e (diff) | |
| download | rabbitmq-server-git-a90903dc5061f7b3f97a8452225387994774e58c.tar.gz | |
merged default into bug22964
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 3 | ||||
| -rw-r--r-- | include/rabbit_exchange_type_spec.hrl | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 0d3b14410b..b9abd78857 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -72,6 +72,8 @@ -record(delivery, {mandatory, immediate, txn, sender, message}). -record(amqp_error, {name, explanation, method = none}). +-record(event, {type, props, timestamp}). + %%---------------------------------------------------------------------------- -define(COPYRIGHT_MESSAGE, "Copyright (C) 2007-2010 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd."). @@ -83,6 +85,7 @@ -define(HIBERNATE_AFTER_MIN, 1000). -define(DESIRED_HIBERNATE, 10000). +-define(STATS_INTERVAL, 5000). -ifdef(debug). -define(LOGDEBUG0(F), rabbit_log:debug(F)). diff --git a/include/rabbit_exchange_type_spec.hrl b/include/rabbit_exchange_type_spec.hrl index f05bcb847f..cecd666b4d 100644 --- a/include/rabbit_exchange_type_spec.hrl +++ b/include/rabbit_exchange_type_spec.hrl @@ -43,7 +43,8 @@ rabbit_types:binding()) -> 'ok'). -spec(remove_bindings/2 :: (rabbit_types:exchange(), [rabbit_types:binding()]) -> 'ok'). --spec(assert_args_equivalence/2 :: (rabbit_types:exchange(), - rabbit_framing:amqp_table()) -> 'ok'). +-spec(assert_args_equivalence/2 :: + (rabbit_types:exchange(), rabbit_framing:amqp_table()) + -> 'ok' | rabbit_types:connection_exit()). -endif. |