Skip to content

Commit

Permalink
fixbug
Browse files Browse the repository at this point in the history
  • Loading branch information
ChinaXing committed Apr 1, 2015
1 parent 6f9ef94 commit 93e6c04
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/lib_misc.erl
Expand Up @@ -50,7 +50,7 @@ gen_logger(Identity, Args0) ->
info ->
error_logger:info_msg(Identity ++ Strformat, list_concat(Args0, Args));
warn ->
error_logger:warn_msg(Identity ++ Strformat, list_concat(Args0, Args));
error_logger:warning_msg(Identity ++ Strformat, list_concat(Args0, Args));
_ ->
error_logger:info_msg(Identity ++ Strformat, list_concat(Args0, Args))
end
Expand Down
10 changes: 6 additions & 4 deletions src/router.erl
Expand Up @@ -10,8 +10,7 @@
-author("LambdaCat").

%% API
%-export([start/7, start_router/5]).
-compile(export_all).
-export([start/7, start_router/5]).
-include("package_constant.hrl").

start(Prefix, Index, Host, Port, BindIp, HeartbeatInterval, WaitTimeout) ->
Expand Down Expand Up @@ -50,7 +49,9 @@ start_router(Host, Port, BindIp, WaitTimeout, Logger) ->
binary,{active, true},
{send_timeout, WaitTimeout}], WaitTimeout),
Logger(info, "connected~n", []),
Pid = spawn_link(?MODULE, io_loop, [Socket, Logger]),
Pid = spawn_link(fun() ->
io_loop(Socket, Logger)
end),
ok = gen_tcp:controlling_process(Socket,Pid),
{ok, Pid}.

Expand All @@ -64,7 +65,8 @@ io_loop(Socket, Logger) ->
Target ! {response, Data},
io_loop(Socket, Logger);
{error, Reason} ->
Logger(error, "cannot demultiplex response Data to biz Packet,~p~n",[Reason])
Logger(warn, "[ignore] cannot demultiplex response Data to biz Packet,~p~n",[Reason]),
io_loop(Socket, Logger)
end;
{From, Type, Packet} ->
put("packet_type_" ++ Type, From), %% save packet type owner / for later demultiplex
Expand Down
6 changes: 4 additions & 2 deletions src/router_heartbeat.erl
Expand Up @@ -15,9 +15,11 @@
%% 2. 调用者可以控制此心跳进程的退出
%% ---------------------------------------------------------
heart_beat_loop(IOPid, {Prefix, Index, WaitTimeout, HeartbeatInterval, Logger}) ->
HeartbeatExecutor = spawn(?MODULE, heart_beat_executor,[IOPid, {Prefix, Index, WaitTimeout, Logger}]),
HeartbeatExecutor = spawn_link(fun() ->
heart_beat_executor(IOPid, {Prefix, Index, WaitTimeout, Logger})
end),
Caller = self(),
Repeater = spawn(fun() ->
Repeater = spawn_link(fun() ->
Ret = heart_beat_fix_rate(HeartbeatExecutor, HeartbeatInterval),
Caller ! {self(), Ret}
end),
Expand Down

0 comments on commit 93e6c04

Please sign in to comment.