From e16ef01d7d538e086a90b5cdb8f8c4db22797e4e Mon Sep 17 00:00:00 2001
From: SisMaker <1713699517@qq.com>
Date: Tue, 6 Apr 2021 23:36:07 +0800
Subject: [PATCH] =?UTF-8?q?ft:=20=E5=B0=86=E9=83=A8=E5=88=86=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=85=8D=E7=BD=AE=20?=
 =?UTF-8?q?=E5=9C=A8=E9=85=8D=E7=BD=AE=E8=A1=A8=E4=B8=AD=E5=8A=A0=E4=B8=AA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=80=89=E9=A1=B9=20app=E9=87=8D=E5=90=AF?=
 =?UTF-8?q?=E6=97=B6=E5=8F=AF=E4=BB=A5=E8=87=AA=E5=8A=A8=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/eSync.hrl      | 17 +++++------------
 src/sync/esSyncSrv.erl |  2 +-
 src/sync/esUtils.erl   |  4 ++--
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/include/eSync.hrl b/include/eSync.hrl
index 86747ff..8554b8b 100644
--- a/include/eSync.hrl
+++ b/include/eSync.hrl
@@ -1,21 +1,14 @@
 -define(LOG_ON(Val), Val == true; Val == all; Val == skip_success; is_list(Val), Val =/= []).
 
--define(TCP_DEFAULT_OPTIONS, [
-   binary
-   , {packet, 4}
-   , {active, true}
-   , {reuseaddr, true}
-   , {nodelay, false}
-   , {delay_send, true}
-   , {send_timeout, 15000}
-   , {keepalive, true}
-   , {exit_on_close, true}]).
-
 -define(Log, log).
 -define(compileCmd, compileCmd).
 -define(extraDirs, extraDirs).
 -define(descendant, descendant).
--define(CfgList, [{?Log, all}, {?compileCmd, undefined}, {?extraDirs, undefined}, {?descendant, fix}]).
+-define(onMSyncFun, onMSyncFun).
+-define(onCSyncFun, onCSyncFun).
+-define(swSyncNode, swSyncNode).
+
+-define(DefCfgList, [{?Log, all}, {?compileCmd, undefined}, {?extraDirs, undefined}, {?descendant, fix}, {?onMSyncFun, undefined}, {?onCSyncFun, undefined}, {?swSyncNode, false}]).
 
 -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 48b0c96..c8de017 100644
--- a/src/sync/esSyncSrv.erl
+++ b/src/sync/esSyncSrv.erl
@@ -103,7 +103,7 @@ start_link() ->
 init(_Args) ->
    erlang:process_flag(trap_exit, true),
    esUtils:loadCfg(),
-   {ok, waiting, #state{}, {doAfter, ?None}}.
+   {ok, waiting, #state{onMSyncFun = ?esCfgSync:getv(?onMSyncFun), onCSyncFun = ?esCfgSync:getv(?onCSyncFun), swSyncNode = ?esCfgSync:getv(?swSyncNode)}, {doAfter, ?None}}.
 
 handleAfter(?None, waiting, State) ->
    %% 启动port 发送监听目录信息
diff --git a/src/sync/esUtils.erl b/src/sync/esUtils.erl
index d664f93..c9aa671 100644
--- a/src/sync/esUtils.erl
+++ b/src/sync/esUtils.erl
@@ -552,7 +552,7 @@ setOptions(SrcDir, Options) ->
    end.
 
 loadCfg() ->
-   KVs = [{Key, esUtils:getEnv(Key, DefVal)} || {Key, DefVal} <- ?CfgList],
+   KVs = [{Key, esUtils:getEnv(Key, DefVal)} || {Key, DefVal} <- ?DefCfgList],
    esUtils:load(?esCfgSync, KVs).
 
 %% *******************************  加载与编译相关 **********************************************************************
@@ -931,7 +931,7 @@ classifyChangeFile([OneFile | LeftFile], Beams, Configs, Hrls, Srcs, ColSrcs, Co
                      classifyChangeFile(LeftFile, Beams, Configs, Hrls, Srcs, ColSrcs, ColHrls, ColConfigs, ColBeams)
                end;
             _ ->
-               classifyChangeFile(LeftFile, [BinMod | Beams], Hrls, Srcs, Configs, ColSrcs, ColHrls, ColConfigs, ColBeams#{BinMod => CurMTimeSec})
+               classifyChangeFile(LeftFile, [BinMod | Beams], Configs, Hrls, Srcs, ColSrcs, ColHrls, ColConfigs, ColBeams#{BinMod => CurMTimeSec})
          end;
       <<".config">> ->
          AbsFile = filename:absname(OneFile),