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),