From 3d35a6fd8e735d33784cf37f53aa5d1dceb22d2c Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Mon, 8 Feb 2021 18:03:12 +0800 Subject: [PATCH] =?UTF-8?q?rf:=20=E5=88=A0=E9=99=A4=E7=9B=91=E5=90=AC?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 - eSync.sample.config | 3 --- include/eSync.hrl | 3 +-- src/sync/esSyncSrv.erl | 6 +++--- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 8ba8e90..9554cc8 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,6 @@ [ {eSync, [ - {listenPort, 12369}, {compileCmd, undefined}, {extraDirs, undefined} {log, all}, diff --git a/eSync.sample.config b/eSync.sample.config index 2d02c36..00822d9 100644 --- a/eSync.sample.config +++ b/eSync.sample.config @@ -1,8 +1,5 @@ [ {eSync, [ - %% 接受fileSync的监听端口 - {listenPort, 12369}, - %% 编译命令 支持项目自带的编译命令 也可以用该项目自带的编译逻辑 %% "rebar3 compile" | "start compile.bat" | "make" {compileCmd, undefined}, diff --git a/include/eSync.hrl b/include/eSync.hrl index c77f364..86747ff 100644 --- a/include/eSync.hrl +++ b/include/eSync.hrl @@ -12,11 +12,10 @@ , {exit_on_close, true}]). -define(Log, log). --define(listenPort, listenPort). -define(compileCmd, compileCmd). -define(extraDirs, extraDirs). -define(descendant, descendant). --define(CfgList, [{?Log, all}, {?listenPort, 12369}, {?compileCmd, undefined}, {?extraDirs, undefined}, {?descendant, fix}]). +-define(CfgList, [{?Log, all}, {?compileCmd, undefined}, {?extraDirs, undefined}, {?descendant, fix}]). -define(esCfgSync, esCfgSync). -define(rootSrcDir, <<"src">>). \ No newline at end of file diff --git a/src/sync/esSyncSrv.erl b/src/sync/esSyncSrv.erl index b3d7c88..05396ee 100644 --- a/src/sync/esSyncSrv.erl +++ b/src/sync/esSyncSrv.erl @@ -96,9 +96,9 @@ init(_Args) -> handleAfter(?None, waiting, State) -> %% 启动tcp 异步监听 然后启动文件同步应用 启动定时器 等待建立连接 超时 就表示文件同步应用启动失败了 报错 - ListenPort = ?esCfgSync:getv(?listenPort), - case gen_tcp:listen(ListenPort, ?TCP_DEFAULT_OPTIONS) of + case gen_tcp:listen(0, ?TCP_DEFAULT_OPTIONS) of {ok, LSock} -> + {ok, ListenPort} = inet:port(LSock), case prim_inet:async_accept(LSock, -1) of {ok, _Ref} -> {ok, SockMod} = inet_db:lookup_socket(LSock), @@ -122,7 +122,7 @@ handleAfter(?None, waiting, State) -> {kpS, State, {sTimeout, 2000, waitConnOver}} end; {error, Reason} -> - Msg = io_lib:format("failed to listen on ~p - ~p (~s) ~n", [ListenPort, Reason, inet:format_error(Reason)]), + Msg = io_lib:format("failed to listen ~p (~s) ~n", [Reason, inet:format_error(Reason)]), esUtils:logErrors(Msg), {kpS, State, {sTimeout, 2000, waitConnOver}} end.