From 223f3d4da5e8bb37c2b18153c805a1f9d77f9490 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Wed, 22 Nov 2017 16:44:00 +0800 Subject: [PATCH] Remove RPC configurations --- Makefile | 5 ++--- src/emqx_rpc.erl | 3 +-- src/emqx_server.erl | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d4cd2009f..c3718ad6a 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,12 @@ PROJECT = emqx PROJECT_DESCRIPTION = EMQ X Broker PROJECT_VERSION = 2.3.0 -NO_AUTOPATCH = gen_rpc cuttlefish +NO_AUTOPATCH = cuttlefish -DEPS = goldrush gproc gen_rpc lager esockd ekka mochiweb pbkdf2 lager_syslog bcrypt clique jsx +DEPS = goldrush gproc lager esockd ekka mochiweb pbkdf2 lager_syslog bcrypt clique jsx dep_goldrush = git https://github.com/basho/goldrush 0.1.9 dep_gproc = git https://github.com/uwiger/gproc -dep_gen_rpc = git https://github.com/priestjim/gen_rpc dep_getopt = git https://github.com/jcomellas/getopt v0.8.2 dep_lager = git https://github.com/basho/lager master dep_lager_syslog = git https://github.com/basho/lager_syslog diff --git a/src/emqx_rpc.erl b/src/emqx_rpc.erl index a39b1c784..a137b543c 100644 --- a/src/emqx_rpc.erl +++ b/src/emqx_rpc.erl @@ -26,6 +26,5 @@ %% @doc Wraps gen_rpc first. cast(Node, Mod, Fun, Args) -> - emqx_metrics:inc('messages/forward'), - gen_rpc:cast({Node, erlang:system_info(scheduler_id)}, Mod, Fun, Args). + emqx_metrics:inc('messages/forward'), rpc:cast(Node, Mod, Fun, Args). diff --git a/src/emqx_server.erl b/src/emqx_server.erl index 726750881..26521fa5c 100644 --- a/src/emqx_server.erl +++ b/src/emqx_server.erl @@ -137,7 +137,7 @@ with_subpid(SubId) when is_binary(SubId) -> with_subpid({SubId, SubPid}) when is_binary(SubId), is_pid(SubPid) -> {SubId, SubPid}. --spec(subscriptions(subscriber()) -> [{subscriber(), binary(), list(suboption())}]). +-spec(subscriptions(emqx:subscriber()) -> [{emqx:subscriber(), binary(), list(emqx:suboption())}]). subscriptions(SubPid) when is_pid(SubPid) -> with_subproperty(ets:lookup(mqtt_subscription, SubPid));