diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2011-02-24 13:31:54 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2011-02-24 13:31:54 +0000 |
| commit | 25623c17a6872bb7376f8d1d7dc68f496576eb7d (patch) | |
| tree | 64f8cdcc16b74d893faa3c061e61b9a3aa06a628 /include | |
| parent | 1f8d8a6d99f3a1fef1117bbb40c9ca6da20659e8 (diff) | |
| parent | fd4705d74ff16f10f11567efcc29d8c3bfe078c2 (diff) | |
| download | rabbitmq-server-git-25623c17a6872bb7376f8d1d7dc68f496576eb7d.tar.gz | |
Merged default into bug23483
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 5 | ||||
| -rw-r--r-- | include/rabbit_backing_queue_spec.hrl | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index b9a01735b3..4d75b5465f 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -62,7 +62,7 @@ -record(listener, {node, protocol, host, ip_address, port}). --record(basic_message, {exchange_name, routing_key, content, guid, +-record(basic_message, {exchange_name, routing_keys = [], content, guid, is_persistent}). -record(ssl_socket, {tcp, ssl}). @@ -87,6 +87,9 @@ -define(DESIRED_HIBERNATE, 10000). -define(STATS_INTERVAL, 5000). +-define(ROUTING_HEADERS, [<<"CC">>, <<"BCC">>]). +-define(DELETED_HEADER, <<"BCC">>). + -ifdef(debug). -define(LOGDEBUG0(F), rabbit_log:debug(F)). -define(LOGDEBUG(F,A), rabbit_log:debug(F,A)). diff --git a/include/rabbit_backing_queue_spec.hrl b/include/rabbit_backing_queue_spec.hrl index accb2c0e6c..17cdedc232 100644 --- a/include/rabbit_backing_queue_spec.hrl +++ b/include/rabbit_backing_queue_spec.hrl @@ -65,3 +65,4 @@ -spec(idle_timeout/1 :: (state()) -> state()). -spec(handle_pre_hibernate/1 :: (state()) -> state()). -spec(status/1 :: (state()) -> [{atom(), any()}]). +-spec(multiple_routing_keys/0 :: () -> 'ok'). |