Переглянути джерело

Rename the 'mqtt_route' record to 'route'

Feng Lee 8 роки тому
батько
коміт
a8aeb5ac17
3 змінених файлів з 385 додано та 822 видалено
  1. 382 819
      erlang.mk
  2. 2 2
      src/emqx_pubsub.erl
  3. 1 1
      src/emqx_router.erl

Різницю між файлами не показано, бо вона завелика
+ 382 - 819
erlang.mk


+ 2 - 2
src/emqx_pubsub.erl

@@ -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) ->

+ 1 - 1
src/emqx_router.erl

@@ -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 -> [];