瀏覽代碼

ft: 将部分动态设置的配置 在配置表中加个配置选项 app重启时可以自动读取

master
SisMaker 4 年之前
父節點
當前提交
e16ef01d7d
共有 3 個檔案被更改,包括 8 行新增15 行删除
  1. +5
    -12
      include/eSync.hrl
  2. +1
    -1
      src/sync/esSyncSrv.erl
  3. +2
    -2
      src/sync/esUtils.erl

+ 5
- 12
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">>).

+ 1
- 1
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

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

Loading…
取消
儲存