Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	README.md

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},
 
       %% 是否开启集群同步加载

src/sync/esSyncSrv.erl

@@ -211,15 +211,17 @@ 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) ->
-   esUtils:logErrors("esSyncSrv receive port exit_status Status:~p ~n", [Status]),
+handleInfo({Port, {exit_status, Status}}, running, #state{port = Port} = _State) ->
+   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;
 handleInfo(_Msg, _, _State) ->
    esUtils:logErrors("esSyncSrv receive unexpect msg:~p ~n", [_Msg]),
    kpS_S.

src/sync/esUtils.erl

@@ -482,19 +482,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
@@ -862,7 +862,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