From 45f347644c087da0dda477349cdc68fb415c0fa7 Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Tue, 18 May 2021 16:16:02 +0800 Subject: [PATCH 1/8] =?UTF-8?q?ft:=20readme=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2638f78..77b76f8 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,10 @@ {compileCmd, undefined}, {extraDirs, undefined} {log, all}, - {descendant, fix} + {descendant, fix}, + {onMSyncFun, undefined}, + {onCSyncFun, undefined}, + {swSyncNode, false} ] } ] \ No newline at end of file From 6a38fdcb8b0df833bbddb5cff5f8b3d443c783f5 Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Mon, 7 Jun 2021 15:01:27 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fx:=20eSync=20=E5=8C=B9=E9=85=8Dexit=20port?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sync/esSyncSrv.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sync/esSyncSrv.erl b/src/sync/esSyncSrv.erl index 8c042cb..9c0479e 100644 --- a/src/sync/esSyncSrv.erl +++ b/src/sync/esSyncSrv.erl @@ -210,13 +210,13 @@ handleInfo({Port, {data, Data}}, Status, #state{srcFiles = Srcs, hrlFiles = Hrls kpS_S end end; -handleInfo({_Port, closed}, running, _State) -> +handleInfo({Port, closed}, running, #state{port = Port} = _State) -> esUtils:logErrors("esSyncSrv receive port closed ~n"), {nextS, port_close, _State}; -handleInfo({'EXIT', _Port, Reason}, running, _State) -> +handleInfo({'EXIT', Port, Reason}, running, #state{port = Port} = _State) -> esUtils:logErrors("esSyncSrv receive port exit Reason:~p ~n", [Reason]), {nextS, {port_EXIT, Reason}, _State}; -handleInfo({_Port, {exit_status, Status}}, running, _State) -> +handleInfo({Port, {exit_status, Status}}, running, #state{port = Port} = _State) -> esUtils:logErrors("esSyncSrv receive port exit_status Status:~p ~n", [Status]), {nextS, {port_exit_status, Status}, _State}; handleInfo(_Msg, _, _State) -> From 44f68e651031179b813066ec5ff4dfcd2d061d45 Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Mon, 7 Jun 2021 16:27:24 +0800 Subject: [PATCH 3/8] fx: eSync --- src/sync/esUtils.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sync/esUtils.erl b/src/sync/esUtils.erl index dcdf2ec..2509b09 100644 --- a/src/sync/esUtils.erl +++ b/src/sync/esUtils.erl @@ -798,7 +798,7 @@ recompileSrcFile(SrcFile, SwSyncNode) -> ignore; {ok, Options} -> RightFileDir = binary_to_list(filename:join(CurSrcDir, filename:basename(SrcFile))), - case CompileFun(RightFileDir, [binary, return | Options]) of + case CompileFun(RightFileDir, [binary, return, no_spawn_compiler_process | Options]) of {ok, Module, Binary, Warnings} -> printResults(Module, RightFileDir, [], Warnings), reloadIfNecessary(Module, OldBinary, Binary, Filename, SwSyncNode), From f5787f16ac1a2d1cc6980515dd7c2a4563ebf9fe Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Tue, 8 Jun 2021 10:10:09 +0800 Subject: [PATCH 4/8] fx: eSync ignore pid exit --- src/sync/esSyncSrv.erl | 2 ++ src/sync/esUtils.erl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sync/esSyncSrv.erl b/src/sync/esSyncSrv.erl index 9c0479e..408a997 100644 --- a/src/sync/esSyncSrv.erl +++ b/src/sync/esSyncSrv.erl @@ -219,6 +219,8 @@ handleInfo({'EXIT', Port, Reason}, running, #state{port = Port} = _State) -> handleInfo({Port, {exit_status, Status}}, running, #state{port = Port} = _State) -> esUtils:logErrors("esSyncSrv receive port exit_status Status:~p ~n", [Status]), {nextS, {port_exit_status, Status}, _State}; +handleInfo({'EXIT', _Pid, _Reason}, running, _State) -> + kpS_S; handleInfo(_Msg, _, _State) -> esUtils:logErrors("esSyncSrv receive unexpect msg:~p ~n", [_Msg]), kpS_S. diff --git a/src/sync/esUtils.erl b/src/sync/esUtils.erl index 2509b09..dcdf2ec 100644 --- a/src/sync/esUtils.erl +++ b/src/sync/esUtils.erl @@ -798,7 +798,7 @@ recompileSrcFile(SrcFile, SwSyncNode) -> ignore; {ok, Options} -> RightFileDir = binary_to_list(filename:join(CurSrcDir, filename:basename(SrcFile))), - case CompileFun(RightFileDir, [binary, return, no_spawn_compiler_process | Options]) of + case CompileFun(RightFileDir, [binary, return | Options]) of {ok, Module, Binary, Warnings} -> printResults(Module, RightFileDir, [], Warnings), reloadIfNecessary(Module, OldBinary, Binary, Filename, SwSyncNode), From 49b6c47bc4c249a6a468adaacb2a58927c32660f Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Fri, 11 Jun 2021 18:09:31 +0800 Subject: [PATCH 5/8] =?UTF-8?q?ft:=20=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sync/esSyncSrv.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sync/esSyncSrv.erl b/src/sync/esSyncSrv.erl index 408a997..67bbccd 100644 --- a/src/sync/esSyncSrv.erl +++ b/src/sync/esSyncSrv.erl @@ -217,7 +217,7 @@ handleInfo({'EXIT', Port, Reason}, running, #state{port = Port} = _State) -> esUtils:logErrors("esSyncSrv receive port exit Reason:~p ~n", [Reason]), {nextS, {port_EXIT, Reason}, _State}; handleInfo({Port, {exit_status, Status}}, running, #state{port = Port} = _State) -> - esUtils:logErrors("esSyncSrv receive port exit_status Status:~p ~n", [Status]), + esUtils:logErrors("esSyncSrv receive port exit_status Status:~p ~p ~n", [Status, Port]), {nextS, {port_exit_status, Status}, _State}; handleInfo({'EXIT', _Pid, _Reason}, running, _State) -> kpS_S; From ac59409a9cba67c96010e252579b1808c8533e99 Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Fri, 25 Jun 2021 00:32:21 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fx:=20=E9=98=B2=E6=AD=A2=E6=97=A0=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E5=A4=B4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sync/esUtils.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sync/esUtils.erl b/src/sync/esUtils.erl index dcdf2ec..109c3f1 100644 --- a/src/sync/esUtils.erl +++ b/src/sync/esUtils.erl @@ -857,7 +857,8 @@ collIncludeCErls([Hrl | LeftHrl], SrcFiles, CSrcs, NewAddMap) -> whoInclude(HrlFile, AllFiles, CFiles, NewAddMap) -> HrlFileBaseName = filename:basename(HrlFile), - doMathEveryFile(maps:iterator(AllFiles), HrlFileBaseName, CFiles, NewAddMap). + QuoteHrlFileBaseName = <<"\"", HrlFileBaseName/binary, "\"">>, + doMathEveryFile(maps:iterator(AllFiles), QuoteHrlFileBaseName, CFiles, NewAddMap). doMathEveryFile(Iterator, HrlFileBaseName, CFiles, NewAddMap) -> case maps:next(Iterator) of From 53cc0a83db88adf5d297cb4c86f77cbfc6fa4c04 Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Thu, 1 Jul 2021 11:39:26 +0800 Subject: [PATCH 7/8] =?UTF-8?q?ft=EF=BC=9A=20=E4=BE=9D=E8=B5=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eSync.sample.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eSync.sample.config b/eSync.sample.config index a48be4d..304c549 100644 --- a/eSync.sample.config +++ b/eSync.sample.config @@ -10,7 +10,7 @@ {log, all}, %% 这个参数用于设置特殊目录下的文件检查编译与加载 - %% 格式:{extraDirs, [{strategy(), [srcDirDescr()]}} | {srcDirs, undefined]} + %% 格式:{extraDirs, [{strategy(), [srcDirDescr()]}] | undefined} %% -type strategy() :: add | only | del. %% 如果 strategy() when add, 会无条件监听添加的指定目录及其子目录同步编译与加载. %% 如果 strategy() when only, 仅仅监听指定目录及其子目录下的文件编译与加载. @@ -29,10 +29,10 @@ %% 默认值: fix {descendant, fix}, - %% Beam更新回调函数 格式 undefined | {Mondule, Fun} | {Mondule, Fun}, {Mod, Fun}(Fun函数只有一个参数)格式， 以及他们的列表组合 + %% Beam更新回调函数 格式: undefined | {Mondule, Fun} | [{Mondule, Fun}, ...], Fun函数只有一个参数 {onMSyncFun, undefined}, - %% config更新回调函数 格式 undefined | {Mondule, Fun} | [{Mondule, Fun}], {Mod, Fun}(Fun函数只有一个参数)格式， 以及他们的列表组合 + %% config更新回调函数 格式: undefined | {Mondule, Fun} | [{Mondule, Fun}, ...], Fun函数只有一个参数 {onCSyncFun, undefined}, %% 是否开启集群同步加载 From ad7caf84c5213b106637364ac50d27165a478039 Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Wed, 7 Jul 2021 16:35:12 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fx:=20=E4=BD=BFerror=5Flogger=E8=83=BD?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=A4=84=E7=90=86=E8=87=AA=E5=8A=A8=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E4=B8=8E=E5=8A=A0=E8=BD=BD=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sync/esUtils.erl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sync/esUtils.erl b/src/sync/esUtils.erl index 109c3f1..ae2b813 100644 --- a/src/sync/esUtils.erl +++ b/src/sync/esUtils.erl @@ -481,19 +481,19 @@ setEnv(Var, Val) -> ok = application:set_env(eSync, Var, Val). logSuccess(Format) -> - canLog(success) andalso logger:notice(Format). + canLog(success) andalso error_logger:info_msg(Format). logSuccess(Format, Args) -> - canLog(success) andalso logger:notice(Format, Args). + canLog(success) andalso error_logger:info_msg(Format, Args). logErrors(Format) -> - canLog(errors) andalso logger:error(Format). + canLog(errors) andalso error_logger:error_msg(Format). logErrors(Format, Args) -> - canLog(errors) andalso logger:error(Format, Args). + canLog(errors) andalso error_logger:error_msg(Format, Args). logWarnings(Format) -> - canLog(warnings) andalso logger:warning(Format) . + canLog(warnings) andalso error_logger:warning_msg(Format) . logWarnings(Format, Args) -> - canLog(warnings) andalso logger:warning(Format, Args) . + canLog(warnings) andalso error_logger:warning_msg(Format, Args) . canLog(MsgType) -> case esSyncSrv:getLog() of