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

Merge branch 'main-v4.3' into copy-of-main-v4.4

This commit is contained in:
zhongwencool 2022-07-26 15:48:06 +08:00
parent 9c41ddaf3b 91a7022e83
commit 0e8888716d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/emqx_management/src/emqx_mgmt_api.erl
View File

@ -127,11 +127,12 @@ node_query(Node, Params, {Tab, QsSchema}, QueryFun, SortFun) ->
true -> Meta#{count => count(Tab), hasnext => length(Rows) > Limit}; true -> Meta#{count => count(Tab), hasnext => length(Rows) > Limit};
_ -> Meta#{count => -1, hasnext => length(Rows) > Limit} _ -> Meta#{count => -1, hasnext => length(Rows) > Limit}
end, end,
NRows = case SortFun of Data0 = lists:sublist(Rows, Limit),
undefined -> Rows; Data = case SortFun of
_ -> lists:sort(SortFun, Rows) undefined -> Data0;
_ -> lists:sort(SortFun, Data0)
end, end,
#{meta => NMeta, data => lists:sublist(NRows, Limit)}. #{meta => NMeta, data => Data}.
%% @private %% @private
do_query(Node, Qs, {M,F}, Start, Limit) when Node =:= node() -> do_query(Node, Qs, {M,F}, Start, Limit) when Node =:= node() ->

5
bin/emqx
View File

@ -879,7 +879,12 @@ case "$1" in
;; ;;
check_conf) check_conf)
generate_config "check_only" generate_config "check_only"
INCLUDE_CONFS=$(< "$RUNNER_ETC_DIR/emqx.conf" grep "include" |awk '{print $2}'|xargs)
if [ "$INCLUDE_CONFS" == "" ]; then
echo "$RUNNER_ETC_DIR/emqx.conf is ok" echo "$RUNNER_ETC_DIR/emqx.conf is ok"
else
echo "$RUNNER_ETC_DIR/emqx.conf(include $INCLUDE_CONFS) is ok"
fi
;; ;;
ctl) ctl)