Browse Source

ft: erpc 替换rpc

master
SisMaker 3 years ago
parent
commit
264cd06b45
2 changed files with 8 additions and 8 deletions
  1. +7
    -7
      src/sync/esUtils.erl
  2. +1
    -1
      src/sync/es_gen_ipc.erl

+ 7
- 7
src/sync/esUtils.erl View File

@ -656,7 +656,7 @@ reloadChangedMod([Module | LeftMod], SwSyncNode, OnSyncFun, Acc) ->
end. end.
getNodes() -> getNodes() ->
lists:usort(lists:flatten(nodes() ++ [rpc:call(X, erlang, nodes, []) || X <- nodes()])) -- [node()].
lists:usort(lists:flatten(nodes() ++ [erpc:call(X, erlang, nodes, []) || X <- nodes()])) -- [node()].
syncLoadModOnAllNodes(false, _Module, _Binary, _Reason) -> syncLoadModOnAllNodes(false, _Module, _Binary, _Reason) ->
ignore; ignore;
@ -667,14 +667,14 @@ syncLoadModOnAllNodes(true, Module, Binary, Reason) ->
[ [
begin begin
esUtils:logSuccess("Do Reloading '~s' on ~p", [Module, Node]), esUtils:logSuccess("Do Reloading '~s' on ~p", [Module, Node]),
rpc:call(Node, code, ensure_loaded, [Module]),
case rpc:call(Node, code, which, [Module]) of
erpc:call(Node, code, ensure_loaded, [Module]),
case erpc:call(Node, code, which, [Module]) of
Filename when is_binary(Filename) orelse is_list(Filename) -> Filename when is_binary(Filename) orelse is_list(Filename) ->
%% File exists, overwrite and load into VM. %% File exists, overwrite and load into VM.
ok = rpc:call(Node, file, write_file, [Filename, Binary]),
rpc:call(Node, code, purge, [Module]),
ok = erpc:call(Node, file, write_file, [Filename, Binary]),
erpc:call(Node, code, purge, [Module]),
case rpc:call(Node, code, load_file, [Module]) of
case erpc:call(Node, code, load_file, [Module]) of
{module, Module} -> {module, Module} ->
esUtils:logSuccess("Reloaded(Beam ~p) Mod:~s and write Success on node:~p", [Reason, Module, Node]); esUtils:logSuccess("Reloaded(Beam ~p) Mod:~s and write Success on node:~p", [Reason, Module, Node]);
{error, What} -> {error, What} ->
@ -682,7 +682,7 @@ syncLoadModOnAllNodes(true, Module, Binary, Reason) ->
end; end;
_ -> _ ->
%% File doesn't exist, just load into VM. %% File doesn't exist, just load into VM.
case rpc:call(Node, code, load_binary, [Module, undefined, Binary]) of
case erpc:call(Node, code, load_binary, [Module, undefined, Binary]) of
{module, Module} -> {module, Module} ->
esUtils:logSuccess("Reloaded(Beam ~p) Mod:~s Success on node:~p", [Reason, Module, Node]); esUtils:logSuccess("Reloaded(Beam ~p) Mod:~s Success on node:~p", [Reason, Module, Node]);
{error, What} -> {error, What} ->

+ 1
- 1
src/sync/es_gen_ipc.erl View File

@ -740,7 +740,7 @@ rec_nodes(Tag, [N | Tail], Name, BadNodes, Replies, Time, TimerId) ->
monitor_node(N, false), monitor_node(N, false),
rec_nodes_rest(Tag, Tail, Name, [N | BadNodes], Replies) rec_nodes_rest(Tag, Tail, Name, [N | BadNodes], Replies)
after Time -> after Time ->
case rpc:call(N, erlang, whereis, [Name]) of
case erpc:call(N, erlang, whereis, [Name]) of
Pid when is_pid(Pid) -> Pid when is_pid(Pid) ->
rec_nodes(Tag, [N | Tail], Name, BadNodes, rec_nodes(Tag, [N | Tail], Name, BadNodes,
Replies, infinity, TimerId); Replies, infinity, TimerId);

Loading…
Cancel
Save