summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-07-30 17:57:46 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-07-30 17:57:46 +0100
commitb688b4ca7e6f0720241945920676160603705375 (patch)
tree035819bca074048be63dffa695b6d0eaade0c18e
parent9a958054949dd064e1e5f1a7f1d0bfce9d91ec49 (diff)
downloadrabbitmq-server-bug25675.tar.gz
Remove redundancy.bug25675
-rw-r--r--src/rabbit_heartbeat.erl5
-rw-r--r--src/rabbit_reader.erl2
-rw-r--r--src/rabbit_writer.erl2
3 files changed, 3 insertions, 6 deletions
diff --git a/src/rabbit_heartbeat.erl b/src/rabbit_heartbeat.erl
index ca83206b..82cccea9 100644
--- a/src/rabbit_heartbeat.erl
+++ b/src/rabbit_heartbeat.erl
@@ -21,9 +21,6 @@
-export([system_continue/3, system_terminate/4, system_code_change/4]).
-%% internal
--export([heartbeater/3]).
-
-include("rabbit.hrl").
%%----------------------------------------------------------------------------
@@ -98,7 +95,7 @@ resume_monitor({_Sender, none}) -> ok;
resume_monitor({_Sender, Receiver}) -> Receiver ! resume, ok.
system_continue(_Parent, Deb, {Params, State}) ->
- ?MODULE:heartbeater(Params, Deb, State).
+ heartbeater(Params, Deb, State).
system_terminate(Reason, _Parent, _Deb, _State) ->
exit(Reason).
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 3cf88d06..b0300ef5 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -120,7 +120,7 @@ init(Parent, ChSup3Pid, Collector, StartHeartbeatFun) ->
end.
system_continue(Parent, Deb, State) ->
- ?MODULE:mainloop(Deb, State#v1{parent = Parent}).
+ mainloop(Deb, State#v1{parent = Parent}).
system_terminate(Reason, _Parent, _Deb, _State) ->
exit(Reason).
diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl
index 78c117e8..1b849fed 100644
--- a/src/rabbit_writer.erl
+++ b/src/rabbit_writer.erl
@@ -124,7 +124,7 @@ initial_state(Sock, Channel, FrameMax, Protocol, ReaderPid, ReaderWantsStats) ->
#wstate.stats_timer).
system_continue(Parent, Deb, State) ->
- ?MODULE:mainloop(Deb, State#wstate{reader = Parent}).
+ mainloop(Deb, State#wstate{reader = Parent}).
system_terminate(Reason, _Parent, _Deb, _State) ->
exit(Reason).