summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gen_server2.erl2
-rw-r--r--src/rabbit_amqqueue.erl4
-rw-r--r--src/rabbit_amqqueue_process.erl8
-rw-r--r--src/rabbit_basic.erl2
-rw-r--r--src/rabbit_binary_generator.erl2
-rw-r--r--src/rabbit_binary_parser.erl2
-rw-r--r--src/rabbit_channel.erl8
-rw-r--r--src/rabbit_control.erl18
-rw-r--r--src/rabbit_error_logger_file_h.erl2
-rw-r--r--src/rabbit_exchange.erl14
-rw-r--r--src/rabbit_framing_channel.erl2
-rw-r--r--src/rabbit_hooks.erl4
-rw-r--r--src/rabbit_mnesia.erl8
-rw-r--r--src/rabbit_net.erl12
-rw-r--r--src/rabbit_networking.erl20
-rw-r--r--src/rabbit_persister.erl20
-rw-r--r--src/rabbit_reader.erl8
-rw-r--r--src/rabbit_tests.erl22
-rw-r--r--src/rabbit_writer.erl2
-rw-r--r--src/tcp_acceptor.erl2
-rw-r--r--src/tcp_listener.erl2
21 files changed, 82 insertions, 82 deletions
diff --git a/src/gen_server2.erl b/src/gen_server2.erl
index 53edf8de..1b24f28e 100644
--- a/src/gen_server2.erl
+++ b/src/gen_server2.erl
@@ -36,7 +36,7 @@
%% InitialTimeout supplied from init). After this timeout has
%% occurred, hibernation will occur as normal. Upon awaking, a new
%% current timeout value will be calculated.
-%%
+%%
%% The purpose is that the gen_server2 takes care of adjusting the
%% current timeout value such that the process will increase the
%% timeout value repeatedly if it is unable to sleep for the
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 515dbf68..9e8e5d6c 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -293,7 +293,7 @@ limit_all(QPids, ChPid, LimiterPid) ->
fun (_) -> ok end,
fun (QPid) -> gen_server2:cast(QPid, {limit, ChPid, LimiterPid}) end,
QPids).
-
+
claim_queue(#amqqueue{pid = QPid}, ReaderPid) ->
gen_server2:call(QPid, {claim_queue, ReaderPid}, infinity).
@@ -302,7 +302,7 @@ basic_get(#amqqueue{pid = QPid}, ChPid, NoAck) ->
basic_consume(#amqqueue{pid = QPid}, NoAck, ReaderPid, ChPid, LimiterPid,
ConsumerTag, ExclusiveConsume, OkMsg) ->
- gen_server2:call(QPid, {basic_consume, NoAck, ReaderPid, ChPid,
+ gen_server2:call(QPid, {basic_consume, NoAck, ReaderPid, ChPid,
LimiterPid, ConsumerTag, ExclusiveConsume, OkMsg},
infinity).
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 80b7a92c..a3b0814c 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -85,7 +85,7 @@
consumers,
transactions,
memory]).
-
+
%%----------------------------------------------------------------------------
start_link(Q) ->
@@ -166,7 +166,7 @@ record_current_channel_tx(ChPid, Txn) ->
%% as a side effect this also starts monitoring the channel (if
%% that wasn't happening already)
store_ch_record((ch_record(ChPid))#cr{txn = Txn}).
-
+
deliver_immediately(Message, Delivered,
State = #q{q = #amqqueue{name = QName},
active_consumers = ActiveConsumers,
@@ -290,7 +290,7 @@ possibly_unblock(State, ChPid, Update) ->
blocked_consumers = NewBlockedConsumers})
end
end.
-
+
should_auto_delete(#q{q = #amqqueue{auto_delete = false}}) -> false;
should_auto_delete(#q{has_had_consumers = false}) -> false;
should_auto_delete(State) -> is_unused(State).
@@ -453,7 +453,7 @@ all_tx() ->
mark_tx_persistent(Txn) ->
Tx = lookup_tx(Txn),
store_tx(Txn, Tx#tx{is_persistent = true}).
-
+
is_tx_persistent(Txn) ->
#tx{is_persistent = Res} = lookup_tx(Txn),
Res.
diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl
index bec2cd08..341aa7d0 100644
--- a/src/rabbit_basic.erl
+++ b/src/rabbit_basic.erl
@@ -46,7 +46,7 @@
-spec(publish/1 :: (delivery()) -> publish_result()).
-spec(delivery/4 :: (boolean(), boolean(), maybe(txn()), message()) ->
- delivery()).
+ delivery()).
-spec(message/4 :: (exchange_name(), routing_key(), properties_input(),
binary()) -> message()).
-spec(properties/1 :: (properties_input()) -> amqp_properties()).
diff --git a/src/rabbit_binary_generator.erl b/src/rabbit_binary_generator.erl
index 01ac4f02..9bffe87e 100644
--- a/src/rabbit_binary_generator.erl
+++ b/src/rabbit_binary_generator.erl
@@ -60,7 +60,7 @@
-spec(build_simple_content_frames/3 ::
(channel_number(), content(), non_neg_integer()) -> [frame()]).
-spec(build_heartbeat_frame/0 :: () -> frame()).
--spec(generate_table/1 :: (amqp_table()) -> binary()).
+-spec(generate_table/1 :: (amqp_table()) -> binary()).
-spec(encode_properties/2 :: ([amqp_property_type()], [any()]) -> binary()).
-spec(check_empty_content_body_frame_size/0 :: () -> 'ok').
diff --git a/src/rabbit_binary_parser.erl b/src/rabbit_binary_parser.erl
index 506e87ec..eaedeba1 100644
--- a/src/rabbit_binary_parser.erl
+++ b/src/rabbit_binary_parser.erl
@@ -139,7 +139,7 @@ parse_properties(Bit, [Type | TypeListRest], Acc, FirstShort,
end,
parse_properties(Bit + 1, TypeListRest, [Value | Acc], FirstShort,
Remainder, Rest).
-
+
parse_property(shortstr, <<Len:8/unsigned, String:Len/binary, Rest/binary>>) ->
{String, Rest};
parse_property(longstr, <<Len:32/unsigned, String:Len/binary, Rest/binary>>) ->
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 7e195d2f..f8e10097 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -485,7 +485,7 @@ handle_method(#'basic.qos'{global = true}, _, _State) ->
rabbit_misc:protocol_error(not_implemented, "global=true", []);
handle_method(#'basic.qos'{prefetch_size = Size}, _, _State) when Size /= 0 ->
- rabbit_misc:protocol_error(not_implemented,
+ rabbit_misc:protocol_error(not_implemented,
"prefetch_size!=0 (~w)", [Size]);
handle_method(#'basic.qos'{prefetch_count = PrefetchCount},
@@ -756,9 +756,9 @@ handle_method(_MethodRecord, _Content, _State) ->
binding_action(Fun, ExchangeNameBin, QueueNameBin, RoutingKey, Arguments,
ReturnMethod, NoWait, State = #ch{virtual_host = VHostPath}) ->
- %% FIXME: connection exception (!) on failure??
+ %% FIXME: connection exception (!) on failure??
%% (see rule named "failure" in spec-XML)
- %% FIXME: don't allow binding to internal exchanges -
+ %% FIXME: don't allow binding to internal exchanges -
%% including the one named "" !
QueueName = expand_queue_name_shortcut(QueueNameBin, State),
check_write_permitted(QueueName, State),
@@ -894,7 +894,7 @@ limit_queues(LPid, #ch{consumer_mapping = Consumers}) ->
rabbit_amqqueue:limit_all(consumer_queues(Consumers), self(), LPid).
consumer_queues(Consumers) ->
- [QPid || QueueName <-
+ [QPid || QueueName <-
sets:to_list(
dict:fold(fun (_ConsumerTag, QueueName, S) ->
sets:add_element(QueueName, S)
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 30dc2e3c..2fe3f33e 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -54,7 +54,7 @@
start() ->
{ok, [[NodeStr|_]|_]} = init:get_argument(nodename),
FullCommand = init:get_plain_arguments(),
- #params{quiet = Quiet, node = Node, command = Command, args = Args} =
+ #params{quiet = Quiet, node = Node, command = Command, args = Args} =
parse_args(FullCommand, #params{quiet = false,
node = rabbit_misc:makenode(NodeStr)}),
Inform = case Quiet of
@@ -156,7 +156,7 @@ Available commands:
list_queues [-p <VHostPath>] [<QueueInfoItem> ...]
list_exchanges [-p <VHostPath>] [<ExchangeInfoItem> ...]
- list_bindings [-p <VHostPath>]
+ list_bindings [-p <VHostPath>]
list_connections [<ConnectionInfoItem> ...]
Quiet output mode is selected with the \"-q\" flag. Informational
@@ -290,7 +290,7 @@ action(list_bindings, Node, Args, Inform) ->
InfoKeys = [exchange_name, queue_name, routing_key, args],
display_info_list(
[lists:zip(InfoKeys, tuple_to_list(X)) ||
- X <- rpc_call(Node, rabbit_exchange, list_bindings, [VHostArg])],
+ X <- rpc_call(Node, rabbit_exchange, list_bindings, [VHostArg])],
InfoKeys),
ok;
@@ -320,9 +320,9 @@ action(list_permissions, Node, VHost, [], Inform) ->
[VHost]})).
parse_vhost_flag(Args) when is_list(Args) ->
- case Args of
+ case Args of
["-p", VHost | RemainingArgs] ->
- {VHost, RemainingArgs};
+ {VHost, RemainingArgs};
RemainingArgs ->
{"/", RemainingArgs}
end.
@@ -332,9 +332,9 @@ parse_vhost_flag_bin(Args) ->
{list_to_binary(VHost), RemainingArgs}.
default_if_empty(List, Default) when is_list(List) ->
- if List == [] ->
- Default;
- true ->
+ if List == [] ->
+ Default;
+ true ->
[list_to_atom(X) || X <- List]
end.
@@ -359,7 +359,7 @@ format_info_item(Key, Items) ->
inet_parse:ntoa(Value);
Value when is_pid(Value) ->
pid_to_string(Value);
- Value when is_binary(Value) ->
+ Value when is_binary(Value) ->
escape(Value);
Value when is_atom(Value) ->
escape(atom_to_list(Value));
diff --git a/src/rabbit_error_logger_file_h.erl b/src/rabbit_error_logger_file_h.erl
index 183b6984..3ad85923 100644
--- a/src/rabbit_error_logger_file_h.erl
+++ b/src/rabbit_error_logger_file_h.erl
@@ -56,7 +56,7 @@ init({{File, Suffix}, []}) ->
init({{File, _}, error}) ->
init(File);
%% Used only when swapping handlers without performing
-%% log rotation
+%% log rotation
init({File, []}) ->
init(File);
init({File, _Type} = FileInfo) ->
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index 33dea8c7..c72ff7f9 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -79,7 +79,7 @@
-spec(delete_binding/4 ::
(exchange_name(), queue_name(), routing_key(), amqp_table()) ->
bind_res() | {'error', 'binding_not_found'}).
--spec(list_bindings/1 :: (vhost()) ->
+-spec(list_bindings/1 :: (vhost()) ->
[{exchange_name(), queue_name(), routing_key(), amqp_table()}]).
-spec(delete_queue_bindings/1 :: (queue_name()) -> 'ok').
-spec(delete_transient_queue_bindings/1 :: (queue_name()) -> 'ok').
@@ -87,9 +87,9 @@
-spec(headers_match/2 :: (amqp_table(), amqp_table()) -> boolean()).
-spec(delete/2 :: (exchange_name(), boolean()) ->
'ok' | not_found() | {'error', 'in_use'}).
--spec(list_queue_bindings/1 :: (queue_name()) ->
+-spec(list_queue_bindings/1 :: (queue_name()) ->
[{exchange_name(), routing_key(), amqp_table()}]).
--spec(list_exchange_bindings/1 :: (exchange_name()) ->
+-spec(list_exchange_bindings/1 :: (exchange_name()) ->
[{queue_name(), routing_key(), amqp_table()}]).
-endif.
@@ -321,7 +321,7 @@ delete_queue_bindings(QueueName, FwdDeleteFun) ->
end || Route <- mnesia:match_object(
rabbit_reverse_route,
reverse_route(
- #route{binding = #binding{queue_name = QueueName,
+ #route{binding = #binding{queue_name = QueueName,
_ = '_'}}),
write)],
[begin
@@ -430,7 +430,7 @@ list_bindings(VHostPath) ->
[{ExchangeName, QueueName, RoutingKey, Arguments} ||
#route{binding = #binding{
exchange_name = ExchangeName,
- key = RoutingKey,
+ key = RoutingKey,
queue_name = QueueName,
args = Arguments}}
<- mnesia:dirty_match_object(
@@ -597,7 +597,7 @@ list_exchange_bindings(ExchangeName) ->
[{QueueName, RoutingKey, Arguments} ||
#route{binding = #binding{queue_name = QueueName,
key = RoutingKey,
- args = Arguments}}
+ args = Arguments}}
<- mnesia:dirty_match_object(rabbit_route, Route)].
% Refactoring is left as an exercise for the reader
@@ -607,5 +607,5 @@ list_queue_bindings(QueueName) ->
[{ExchangeName, RoutingKey, Arguments} ||
#route{binding = #binding{exchange_name = ExchangeName,
key = RoutingKey,
- args = Arguments}}
+ args = Arguments}}
<- mnesia:dirty_match_object(rabbit_route, Route)].
diff --git a/src/rabbit_framing_channel.erl b/src/rabbit_framing_channel.erl
index 5c447792..3bde0879 100644
--- a/src/rabbit_framing_channel.erl
+++ b/src/rabbit_framing_channel.erl
@@ -115,7 +115,7 @@ collect_content_payload(ChannelPid, RemainingByteCount, Acc) ->
collect_content_payload(ChannelPid,
RemainingByteCount - size(FragmentBin),
[FragmentBin | Acc]);
- _ ->
+ _ ->
rabbit_misc:protocol_error(
command_invalid,
"expected content body, got non content body frame instead",
diff --git a/src/rabbit_hooks.erl b/src/rabbit_hooks.erl
index b3d271c2..3faeec26 100644
--- a/src/rabbit_hooks.erl
+++ b/src/rabbit_hooks.erl
@@ -61,8 +61,8 @@ unsubscribe(Hook, HandlerName) ->
trigger(Hook, Args) ->
Hooks = ets:lookup(?TableName, Hook),
[case catch apply(M, F, [Hook, Name, Args | A]) of
- {'EXIT', Reason} ->
- rabbit_log:warning("Failed to execute handler ~p for hook ~p: ~p",
+ {'EXIT', Reason} ->
+ rabbit_log:warning("Failed to execute handler ~p for hook ~p: ~p",
[Name, Hook, Reason]);
_ -> ok
end || {_, Name, {M, F, A}} <- Hooks],
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 749038db..1e700362 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -55,8 +55,8 @@
-spec(cluster/1 :: ([erlang_node()]) -> 'ok').
-spec(reset/0 :: () -> 'ok').
-spec(force_reset/0 :: () -> 'ok').
--spec(is_clustered/0 :: () -> boolean()).
--spec(empty_ram_only_tables/0 :: () -> 'ok').
+-spec(is_clustered/0 :: () -> boolean()).
+-spec(empty_ram_only_tables/0 :: () -> 'ok').
-spec(create_tables/0 :: () -> 'ok').
-endif.
@@ -173,7 +173,7 @@ replicated_table_names() ->
].
dir() -> mnesia:system_info(directory).
-
+
ensure_mnesia_dir() ->
MnesiaDir = dir() ++ "/",
case filelib:ensure_dir(MnesiaDir) of
@@ -389,7 +389,7 @@ wait_for_replicated_tables() -> wait_for_tables(replicated_table_names()).
wait_for_tables() -> wait_for_tables(table_names()).
-wait_for_tables(TableNames) ->
+wait_for_tables(TableNames) ->
case check_schema_integrity() of
ok ->
case mnesia:wait_for_tables(TableNames, 30000) of
diff --git a/src/rabbit_net.erl b/src/rabbit_net.erl
index a5ccc8e9..e9634c03 100644
--- a/src/rabbit_net.erl
+++ b/src/rabbit_net.erl
@@ -40,7 +40,7 @@
-ifdef(use_specs).
--type(stat_option() ::
+-type(stat_option() ::
'recv_cnt' | 'recv_max' | 'recv_avg' | 'recv_oct' | 'recv_dvi' |
'send_cnt' | 'send_max' | 'send_avg' | 'send_oct' | 'send_pend').
-type(error() :: {'error', any()}).
@@ -50,11 +50,11 @@
-spec(controlling_process/2 :: (socket(), pid()) -> 'ok' | error()).
-spec(port_command/2 :: (socket(), iolist()) -> 'true').
-spec(send/2 :: (socket(), binary() | iolist()) -> 'ok' | error()).
--spec(peername/1 :: (socket()) ->
+-spec(peername/1 :: (socket()) ->
{'ok', {ip_address(), non_neg_integer()}} | error()).
--spec(sockname/1 :: (socket()) ->
+-spec(sockname/1 :: (socket()) ->
{'ok', {ip_address(), non_neg_integer()}} | error()).
--spec(getstat/2 :: (socket(), [stat_option()]) ->
+-spec(getstat/2 :: (socket(), [stat_option()]) ->
{'ok', [{stat_option(), integer()}]} | error()).
-endif.
@@ -66,8 +66,8 @@ async_recv(Sock, Length, Timeout) when is_record(Sock, ssl_socket) ->
Pid = self(),
Ref = make_ref(),
- spawn(fun() -> Pid ! {inet_async, Sock, Ref,
- ssl:recv(Sock#ssl_socket.ssl, Length, Timeout)}
+ spawn(fun() -> Pid ! {inet_async, Sock, Ref,
+ ssl:recv(Sock#ssl_socket.ssl, Length, Timeout)}
end),
{ok, Ref};
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 84658a85..84be7918 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -31,10 +31,10 @@
-module(rabbit_networking).
--export([boot/0, start/0, start_tcp_listener/2, start_ssl_listener/3,
- stop_tcp_listener/2, on_node_down/1, active_listeners/0,
- node_listeners/1, connections/0, connection_info/1,
- connection_info/2, connection_info_all/0,
+-export([boot/0, start/0, start_tcp_listener/2, start_ssl_listener/3,
+ stop_tcp_listener/2, on_node_down/1, active_listeners/0,
+ node_listeners/1, connections/0, connection_info/1,
+ connection_info/2, connection_info_all/0,
connection_info_all/1]).
%%used by TCP-based transports, e.g. STOMP adapter
-export([check_tcp_listener_address/3]).
@@ -46,11 +46,11 @@
-include_lib("kernel/include/inet.hrl").
-define(RABBIT_TCP_OPTS, [
- binary,
- {packet, raw}, % no packaging
- {reuseaddr, true}, % allow rebind without waiting
- %% {nodelay, true}, % TCP_NODELAY - disable Nagle's alg.
- %% {delay_send, true},
+ binary,
+ {packet, raw}, % no packaging
+ {reuseaddr, true}, % allow rebind without waiting
+ %% {nodelay, true}, % TCP_NODELAY - disable Nagle's alg.
+ %% {delay_send, true},
{exit_on_close, false}
]).
@@ -206,7 +206,7 @@ start_ssl_client(SslOpts, Sock) ->
{error, {ssl_upgrade_error, Reason}};
{'EXIT', Reason} ->
{error, {ssl_upgrade_failure, Reason}}
-
+
end
end).
diff --git a/src/rabbit_persister.erl b/src/rabbit_persister.erl
index d0d60ddf..687fc5b3 100644
--- a/src/rabbit_persister.erl
+++ b/src/rabbit_persister.erl
@@ -57,7 +57,7 @@
-record(pstate, {log_handle, entry_count, deadline,
pending_logs, pending_replies,
- snapshot}).
+ snapshot}).
%% two tables for efficient persistency
%% one maps a key to a message
@@ -166,7 +166,7 @@ handle_call({transaction, Key, MessageList}, From, State) ->
do_noreply(internal_commit(From, Key, NewState));
handle_call({commit_transaction, TxnKey}, From, State) ->
do_noreply(internal_commit(From, TxnKey, State));
-handle_call(force_snapshot, _From, State) ->
+handle_call(force_snapshot, _From, State) ->
do_reply(ok, flush(true, State));
handle_call(serial, _From,
State = #pstate{snapshot = #psnapshot{serial = Serial}}) ->
@@ -211,7 +211,7 @@ internal_dirty_work(MessageList, State) ->
log_work(fun (ML) -> {dirty_work, ML} end,
MessageList, State).
-internal_commit(From, Key, State = #pstate{snapshot = Snapshot}) ->
+internal_commit(From, Key, State = #pstate{snapshot = Snapshot}) ->
Unit = {commit_transaction, Key},
NewSnapshot = internal_integrate1(Unit, Snapshot),
complete(From, Unit, State#pstate{snapshot = NewSnapshot}).
@@ -243,7 +243,7 @@ log_work(CreateWorkUnit, MessageList,
fun(M = {publish, Message, QK = {_QName, PKey}}) ->
case ets:lookup(Messages, PKey) of
[_] -> {tied, QK};
- [] -> ets:insert(Messages, {PKey, Message}),
+ [] -> ets:insert(Messages, {PKey, Message}),
M
end;
(M) -> M
@@ -252,7 +252,7 @@ log_work(CreateWorkUnit, MessageList,
NewSnapshot = internal_integrate1(Unit, Snapshot),
log(State#pstate{snapshot = NewSnapshot}, Unit).
-log(State = #pstate{deadline = ExistingDeadline, pending_logs = Logs},
+log(State = #pstate{deadline = ExistingDeadline, pending_logs = Logs},
Message) ->
State#pstate{deadline = compute_deadline(?LOG_BUNDLE_DELAY,
ExistingDeadline),
@@ -365,7 +365,7 @@ prune_table(Tab, Keys) ->
true = ets:safe_fixtable(Tab, true),
ok = prune_table(Tab, Keys, ets:first(Tab)),
true = ets:safe_fixtable(Tab, false).
-
+
prune_table(_Tab, _Keys, '$end_of_table') -> ok;
prune_table(Tab, Keys, Key) ->
case sets:is_element(Key, Keys) of
@@ -374,7 +374,7 @@ prune_table(Tab, Keys, Key) ->
end,
prune_table(Tab, Keys, ets:next(Tab, Key)).
-internal_load_snapshot(LogHandle,
+internal_load_snapshot(LogHandle,
Snapshot = #psnapshot{messages = Messages,
queues = Queues}) ->
{K, [Loaded_Snapshot | Items]} = disk_log:chunk(LogHandle, start),
@@ -435,9 +435,9 @@ accumulate_requeues({{QName, PKey}, Delivered}, Acc) ->
requeue(QName, Requeues, Messages) ->
case rabbit_amqqueue:lookup(QName) of
{ok, #amqqueue{pid = QPid}} ->
- RequeueMessages =
+ RequeueMessages =
[{{QName, PKey}, Message, Delivered} ||
- {PKey, Delivered} <- Requeues,
+ {PKey, Delivered} <- Requeues,
{_, Message} <- ets:lookup(Messages, PKey)],
rabbit_amqqueue:redeliver(
QPid,
@@ -459,7 +459,7 @@ replay([], LogHandle, K, Snapshot) ->
{K1, Items} ->
replay(Items, LogHandle, K1, Snapshot);
{K1, Items, Badbytes} ->
- rabbit_log:warning("~p bad bytes recovering persister log~n",
+ rabbit_log:warning("~p bad bytes recovering persister log~n",
[Badbytes]),
replay(Items, LogHandle, K1, Snapshot);
eof -> Snapshot
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index e78d889d..503e2fb4 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -193,7 +193,7 @@ teardown_profiling(Value) ->
inet_op(F) -> rabbit_misc:throw_on_error(inet_error, F).
-socket_op(Sock, Fun) ->
+socket_op(Sock, Fun) ->
case Fun(Sock) of
{ok, Res} -> Res;
{error, Reason} -> rabbit_log:error("error on TCP connection ~p:~p~n",
@@ -213,7 +213,7 @@ start_connection(Parent, Deb, Sock, SockTransform) ->
erlang:send_after(?HANDSHAKE_TIMEOUT * 1000, self(),
handshake_timeout),
ProfilingValue = setup_profiling(),
- try
+ try
mainloop(Parent, Deb, switch_callback(
#v1{sock = ClientSock,
connection = #connection{
@@ -271,7 +271,7 @@ mainloop(Parent, Deb, State = #v1{sock= Sock, recv_ref = Ref}) ->
[Reason], none));
true -> ok
end,
- %% this is what we are expected to do according to
+ %% this is what we are expected to do according to
%% http://www.erlang.org/doc/man/sys.html
%%
%% If we wanted to be *really* nice we should wait for a
@@ -671,7 +671,7 @@ i(peer_port, #v1{sock = Sock}) ->
{ok, {_, P}} = rabbit_net:peername(Sock),
P;
i(SockStat, #v1{sock = Sock}) when SockStat =:= recv_oct;
- SockStat =:= recv_cnt;
+ SockStat =:= recv_cnt;
SockStat =:= send_oct;
SockStat =:= send_cnt;
SockStat =:= send_pend ->
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index ba048184..66bdd4cd 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -105,7 +105,7 @@ test_priority_queue() ->
{true, false, 2, [{1, bar}, {0, foo}], [bar, foo]} =
test_priority_queue(Q6),
- %% merge 1-element priority Q with 1-element no-priority Q
+ %% merge 1-element priority Q with 1-element no-priority Q
Q7 = priority_queue:join(priority_queue:in(foo, 1, Q),
priority_queue:in(bar, Q)),
{true, false, 2, [{1, foo}, {0, bar}], [foo, bar]} =
@@ -290,7 +290,7 @@ test_field_values() ->
4,"long", "l", 1234567890:64, % + 14 = 145
5,"short", "s", 655:16, % + 9 = 154
4,"bool", "t", 1, % + 7 = 161
- 6,"binary", "x", 15:32, "a binary string", % + 27 = 188
+ 6,"binary", "x", 15:32, "a binary string", % + 27 = 188
4,"void", "V", % + 6 = 194
5,"array", "A", 23:32, % + 11 = 205
"I", 54321:32, % + 5 = 210
@@ -423,7 +423,7 @@ test_log_management_during_startup() ->
{sasl_report_tty_h, []}]),
ok = control_action(start_app, []),
- %% start application with tty logging and
+ %% start application with tty logging and
%% proper handlers not installed
ok = control_action(stop_app, []),
ok = error_logger:tty(false),
@@ -455,7 +455,7 @@ test_log_management_during_startup() ->
ok = add_log_handlers([{error_logger_file_h, MainLog}]),
ok = case control_action(start_app, []) of
ok -> exit({got_success_but_expected_failure,
- log_rotation_no_write_permission_dir_test});
+ log_rotation_no_write_permission_dir_test});
{error, {cannot_log_to_file, _, _}} -> ok
end,
@@ -476,7 +476,7 @@ test_log_management_during_startup() ->
ok = file:del_dir(TmpDir),
%% start application with standard error_logger_file_h
- %% handler not installed
+ %% handler not installed
ok = application:set_env(kernel, error_logger, {file, MainLog}),
ok = control_action(start_app, []),
ok = control_action(stop_app, []),
@@ -584,7 +584,7 @@ test_cluster_management2(SecondaryNode) ->
ok = control_action(cluster, [SecondaryNodeS, NodeS]),
ok = control_action(start_app, []),
ok = control_action(stop_app, []),
-
+
%% convert a disk node into a ram node
ok = control_action(cluster, ["invalid1@invalid",
"invalid2@invalid"]),
@@ -760,11 +760,11 @@ test_hooks() ->
{[arg1, arg2], 1, 3} = get(arg_hook_test_fired),
%% Invoking Pids
- Remote = fun() ->
- receive
- {rabbitmq_hook,[remote_test,test,[],Target]} ->
+ Remote = fun() ->
+ receive
+ {rabbitmq_hook,[remote_test,test,[],Target]} ->
Target ! invoked
- end
+ end
end,
P = spawn(Remote),
rabbit_hooks:subscribe(remote_test, test, {rabbit_hooks, notify_remote, [P, [self()]]}),
@@ -790,7 +790,7 @@ control_action(Command, Node, Args) ->
ok ->
io:format("done.~n"),
ok;
- Other ->
+ Other ->
io:format("failed.~n"),
Other
end.
diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl
index 1679ce7c..02b9968d 100644
--- a/src/rabbit_writer.erl
+++ b/src/rabbit_writer.erl
@@ -59,7 +59,7 @@
(pid(), pid(), pid(), amqp_method(), content()) -> 'ok').
-spec(internal_send_command/3 ::
(socket(), channel_number(), amqp_method()) -> 'ok').
--spec(internal_send_command/5 ::
+-spec(internal_send_command/5 ::
(socket(), channel_number(), amqp_method(),
content(), non_neg_integer()) -> 'ok').
diff --git a/src/tcp_acceptor.erl b/src/tcp_acceptor.erl
index bc742561..8cdf8d97 100644
--- a/src/tcp_acceptor.erl
+++ b/src/tcp_acceptor.erl
@@ -63,7 +63,7 @@ handle_info({inet_async, LSock, Ref, {ok, Sock}},
State = #state{callback={M,F,A}, sock=LSock, ref=Ref}) ->
%% patch up the socket so it looks like one we got from
- %% gen_tcp:accept/1
+ %% gen_tcp:accept/1
{ok, Mod} = inet_db:lookup_socket(LSock),
inet_db:register_socket(Sock, Mod),
diff --git a/src/tcp_listener.erl b/src/tcp_listener.erl
index 4a2e149b..fdb6ec86 100644
--- a/src/tcp_listener.erl
+++ b/src/tcp_listener.erl
@@ -69,7 +69,7 @@ init({IPAddress, Port, SocketOpts,
[Label, inet_parse:ntoa(LIPAddress), LPort]),
apply(M, F, A ++ [IPAddress, Port]),
{ok, #state{sock = LSock,
- on_startup = OnStartup, on_shutdown = OnShutdown,
+ on_startup = OnStartup, on_shutdown = OnShutdown,
label = Label}};
{error, Reason} ->
error_logger:error_msg(
View Lorry Controller Status