yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the 'mqtt_route' record to 'route'

This commit is contained in:
Feng Lee 2018-02-27 09:13:14 +08:00
parent f4fd6efe16
commit a8aeb5ac17
3 changed files with 384 additions and 821 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1197
erlang.mk vendored
View File

File diff suppressed because it is too large Load Diff

4
src/emqx_pubsub.erl
View File

@ -73,12 +73,12 @@ route([], #mqtt_delivery{message = Msg}) ->
dropped(Msg#mqtt_message.topic), ignore; dropped(Msg#mqtt_message.topic), ignore;
%% Dispatch on the local node. %% Dispatch on the local node.
route([#mqtt_route{topic = To, node = Node}], route([#route{topic = To, node = Node}],
Delivery = #mqtt_delivery{flows = Flows}) when Node =:= node() -> Delivery = #mqtt_delivery{flows = Flows}) when Node =:= node() ->
dispatch(To, Delivery#mqtt_delivery{flows = [{route, Node, To} | Flows]}); dispatch(To, Delivery#mqtt_delivery{flows = [{route, Node, To} | Flows]});
%% Forward to other nodes %% Forward to other nodes
route([#mqtt_route{topic = To, node = Node}], Delivery = #mqtt_delivery{flows = Flows}) -> route([#route{topic = To, node = Node}], Delivery = #mqtt_delivery{flows = Flows}) ->
forward(Node, To, Delivery#mqtt_delivery{flows = [{route, Node, To}|Flows]}); forward(Node, To, Delivery#mqtt_delivery{flows = [{route, Node, To}|Flows]});
route(Routes, Delivery) -> route(Routes, Delivery) ->

2
src/emqx_router.erl
View File

@ -196,7 +196,7 @@ add_local_route(Topic) ->
del_local_route(Topic) -> del_local_route(Topic) ->
gen_server:call(?ROUTER, {del_local_route, Topic}). gen_server:call(?ROUTER, {del_local_route, Topic}).
-spec(match_local(binary()) -> [mqtt_route()]). -spec(match_local(binary()) -> [route()]).
match_local(Name) -> match_local(Name) ->
case ets:info(local_route, size) of case ets:info(local_route, size) of
0 -> []; 0 -> [];