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

chore(gw): add default value for lwm2m gateway

This commit is contained in:
JianBo He 2022-04-27 16:12:51 +08:00
parent 2dded74584
commit 66c08bdc8b
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/emqx_gateway/src/emqx_gateway_schema.erl
View File

@ -103,6 +103,7 @@ fields(gateway) ->
fields(stomp) -> fields(stomp) ->
[ [
{frame, sc(ref(stomp_frame))}, {frame, sc(ref(stomp_frame))},
{mountpoint, mountpoint()},
{listeners, sc(ref(tcp_listeners), #{desc => ?DESC(tcp_listeners)})} {listeners, sc(ref(tcp_listeners), #{desc => ?DESC(tcp_listeners)})}
] ++ gateway_common_options(); ] ++ gateway_common_options();
fields(stomp_frame) -> fields(stomp_frame) ->
@ -177,6 +178,7 @@ fields(mqttsn) ->
desc => ?DESC(mqttsn_predefined) desc => ?DESC(mqttsn_predefined)
} }
)}, )},
{mountpoint, mountpoint()},
{listeners, sc(ref(udp_listeners), #{desc => ?DESC(udp_listeners)})} {listeners, sc(ref(udp_listeners), #{desc => ?DESC(udp_listeners)})}
] ++ gateway_common_options(); ] ++ gateway_common_options();
fields(mqttsn_predefined) -> fields(mqttsn_predefined) ->
@ -235,6 +237,7 @@ fields(coap) ->
desc => ?DESC(coap_publish_qos) desc => ?DESC(coap_publish_qos)
} }
)}, )},
{mountpoint, mountpoint()},
{listeners, {listeners,
sc( sc(
ref(udp_listeners), ref(udp_listeners),
@ -302,6 +305,7 @@ fields(lwm2m) ->
desc => ?DESC(lwm2m_translators) desc => ?DESC(lwm2m_translators)
} }
)}, )},
{mountpoint, mountpoint("lwm2m/${endpoint_name}/")},
{listeners, sc(ref(udp_listeners), #{desc => ?DESC(udp_listeners)})} {listeners, sc(ref(udp_listeners), #{desc => ?DESC(udp_listeners)})}
] ++ gateway_common_options(); ] ++ gateway_common_options();
fields(exproto) -> fields(exproto) ->
@ -322,6 +326,7 @@ fields(exproto) ->
desc => ?DESC(exproto_handler) desc => ?DESC(exproto_handler)
} }
)}, )},
{mountpoint, mountpoint()},
{listeners, sc(ref(tcp_udp_listeners), #{desc => ?DESC(tcp_udp_listeners)})} {listeners, sc(ref(tcp_udp_listeners), #{desc => ?DESC(tcp_udp_listeners)})}
] ++ gateway_common_options(); ] ++ gateway_common_options();
fields(exproto_grpc_server) -> fields(exproto_grpc_server) ->
@ -592,15 +597,6 @@ gateway_common_options() ->
desc => ?DESC(gateway_common_idle_timeout) desc => ?DESC(gateway_common_idle_timeout)
} }
)}, )},
{mountpoint,
sc(
binary(),
#{
default => <<>>,
%% TODO: variable support?
desc => ?DESC(gateway_common_mountpoint)
}
)},
{clientinfo_override, {clientinfo_override,
sc( sc(
ref(clientinfo_override), ref(clientinfo_override),
@ -609,6 +605,17 @@ gateway_common_options() ->
{?EMQX_AUTHENTICATION_CONFIG_ROOT_NAME_ATOM, authentication_schema()} {?EMQX_AUTHENTICATION_CONFIG_ROOT_NAME_ATOM, authentication_schema()}
]. ].
mountpoint() ->
mountpoint(<<>>).
mountpoint(Default) ->
sc(
binary(),
#{
default => Default,
desc => ?DESC(gateway_common_mountpoint)
}
).
common_listener_opts() -> common_listener_opts() ->
[ [
{enable, {enable,