فهرست منبع

chore(mix): fix: use Elixir's own rpc-eval call for "eval"

Thales Macedo Garitezi 4 سال پیش
والد
کامیت
0655572f64
2فایلهای تغییر یافته به همراه7 افزوده شده و 20 حذف شده
  1. 7 1
      bin/emqx
  2. 0 19
      bin/nodetool

+ 7 - 1
bin/emqx

@@ -481,7 +481,13 @@ case "${COMMAND}" in
         shift
         if [ "$IS_ELIXIR" = "yes" ]
         then
-          relx_nodetool "eval-elixir" "$@"
+          "$REL_DIR/elixir" \
+              --hidden \
+              --cookie "$COOKIE" \
+              --boot "$REL_DIR/start_clean" \
+              --boot-var RELEASE_LIB "$ERTS_LIB_DIR" \
+              --vm-args "$(latest_vm_args 'EMQX_NODE__NAME')"\
+              --rpc-eval "$NAME" "$@"
         else
           relx_nodetool "eval" "$@"
         fi

+ 0 - 19
bin/nodetool

@@ -126,25 +126,6 @@ do(Args) ->
                     io:format("RPC to ~p failed: ~p~n", [TargetNode, Reason]),
                     halt(1)
             end;
-        ["eval-elixir" | ListOfArgs] ->
-            JoinedArgs = string:join(ListOfArgs, " "),
-            case rpc:call(TargetNode, 'Elixir.Code', eval_string, [JoinedArgs]) of
-                {Value, []} ->
-                    %% Since we are in Erlang land, we ask Elixir to
-                    %% format the result as well:
-                    case rpc:call(TargetNode, 'Elixir.Kernel', inspect, [Value, [{pretty, true}]]) of
-                        {badrpc, Reason} ->
-                            io:format(
-                              "Warning: failed to format term with Elixir syntax. Reason: ~p~n"
-                              "Warning: falling back to Erlang syntax:~n"
-                              "~p~n", [Reason, Value]);
-                        PrettyStr ->
-                            io:format("~s~n", [PrettyStr])
-                    end;
-                {badrpc, Reason} ->
-                    io:format("RPC to ~p failed: ~p~n", [TargetNode, Reason]),
-                    halt(1)
-            end;
         Other ->
             io:format("Other: ~p~n", [Other]),
             io:format("Usage: nodetool chkconfig|getpid|ping|stop|rpc|rpc_infinity|rpcterms|eval|cold_eval [Terms] [RPC]\n")