fix: uptime sometimes crash
This commit is contained in:
zhongwencool
parent
f62795d919
commit
596ec24c3a
|
|
@ -11,6 +11,7 @@
|
|||
{load_module, emqx_metrics, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{suspend, [esockd_acceptor,emqx_connection, emqx_ws_connection]},
|
||||
{load_module, emqx_frame, brutal_purge, soft_purge, []},
|
||||
{update, emqx_connection, {advanced, []}},
|
||||
|
|
@ -39,6 +40,7 @@
|
|||
{load_module, emqx_session, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{suspend, [esockd_acceptor, emqx_connection, emqx_ws_connection]},
|
||||
{load_module, emqx_frame, brutal_purge, soft_purge, []},
|
||||
{update, emqx_connection, {advanced, []}},
|
||||
|
|
@ -83,6 +85,7 @@
|
|||
{load_module, emqx_app, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
|
||||
]},
|
||||
{<<"4.2.4">>, [
|
||||
|
|
@ -108,6 +111,7 @@
|
|||
{load_module, emqx_app, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
|
||||
]},
|
||||
{<<"4.2.5">>, [
|
||||
|
|
@ -152,6 +156,7 @@
|
|||
{load_module, emqx_os_mon, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
|
||||
]},
|
||||
{<<"4.2.8">>, [
|
||||
|
|
@ -163,6 +168,7 @@
|
|||
{load_module, emqx_cm, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_app, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_alarm, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_os_mon, brutal_purge, soft_purge, []},
|
||||
|
|
@ -176,6 +182,7 @@
|
|||
{load_module, emqx_ws_connection, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_app, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_alarm, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_os_mon, brutal_purge, soft_purge, []},
|
||||
|
|
@ -190,6 +197,7 @@
|
|||
{load_module, emqx_alarm, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
|
||||
]},
|
||||
{<<".*">>, []}
|
||||
|
|
@ -203,6 +211,7 @@
|
|||
{load_module, emqx_metrics, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{suspend, [esockd_acceptor, emqx_connection, emqx_ws_connection]},
|
||||
{load_module, emqx_frame, brutal_purge, soft_purge, []},
|
||||
{update, emqx_connection, {advanced, []}},
|
||||
|
|
@ -230,6 +239,7 @@
|
|||
{load_module, emqx_os_mon, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{suspend, [esockd_acceptor, emqx_connection, emqx_ws_connection]},
|
||||
{load_module, emqx_channel, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_session, brutal_purge, soft_purge, []},
|
||||
|
|
@ -276,6 +286,7 @@
|
|||
{load_module, emqx_app, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
|
||||
]},
|
||||
{<<"4.2.4">>, [
|
||||
|
|
@ -301,6 +312,7 @@
|
|||
{load_module, emqx_misc,brutal_purge,soft_purge,[]},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
|
||||
]},
|
||||
{<<"4.2.5">>, [
|
||||
|
|
@ -326,6 +338,7 @@
|
|||
{load_module, emqx_misc,brutal_purge,soft_purge,[]},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
|
||||
]},
|
||||
{<<"4.2.[6-7]">>, [
|
||||
|
|
@ -345,6 +358,7 @@
|
|||
{load_module, emqx_misc,brutal_purge,soft_purge,[]},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
|
||||
]},
|
||||
{<<"4.2.8">>, [
|
||||
|
|
@ -359,6 +373,7 @@
|
|||
{load_module, emqx_alarm, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
|
||||
]},
|
||||
{<<"4.2.9">>, [
|
||||
|
|
@ -369,6 +384,7 @@
|
|||
{load_module, emqx_ws_connection, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_app, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_os_mon, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_alarm, brutal_purge, soft_purge, []},
|
||||
|
|
@ -383,6 +399,7 @@
|
|||
{load_module, emqx_alarm, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_limiter, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_listeners, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_sys, brutal_purge, soft_purge, []},
|
||||
{load_module, emqx_plugins, brutal_purge, soft_purge, []}
|
||||
]},
|
||||
{<<".*">>, []}
|
||||
|
|
|
|||
|
|
@ -96,7 +96,15 @@ sysdescr() ->
|
|||
%% @doc Get sys uptime
|
||||
-spec(uptime() -> string()).
|
||||
uptime() ->
|
||||
gen_server:call(?SYS, uptime).
|
||||
{TotalWallClock, _} = erlang:statistics(wall_clock),
|
||||
uptime(TotalWallClock div 1000).
|
||||
|
||||
uptime(Seconds) ->
|
||||
{D, {H, M, S}} = calendar:seconds_to_daystime(Seconds),
|
||||
L0 = [{D, " days"}, {H, " hours"}, {M, " minutes"}, {S, " seconds"}],
|
||||
L1 = lists:dropwhile(fun({K, _}) -> K =:= 0 end, L0),
|
||||
L2 = lists:map(fun({Time, Unit}) -> [integer_to_list(Time), Unit] end, L1),
|
||||
lists:flatten(lists:join(", ", L2)).
|
||||
|
||||
%% @doc Get sys datetime
|
||||
-spec(datetime() -> string()).
|
||||
|
|
@ -139,9 +147,6 @@ heartbeat(State) ->
|
|||
tick(State) ->
|
||||
State#state{ticker = start_timer(sys_interval(), tick)}.
|
||||
|
||||
handle_call(uptime, _From, State) ->
|
||||
{reply, uptime(State), State};
|
||||
|
||||
handle_call(Req, _From, State) ->
|
||||
?LOG(error, "Unexpected call: ~p", [Req]),
|
||||
{reply, ignored, State}.
|
||||
|
|
@ -151,7 +156,7 @@ handle_cast(Msg, State) ->
|
|||
{noreply, State}.
|
||||
|
||||
handle_info({timeout, TRef, heartbeat}, State = #state{heartbeat = TRef}) ->
|
||||
publish(uptime, iolist_to_binary(uptime(State))),
|
||||
publish(uptime, iolist_to_binary(uptime())),
|
||||
publish(datetime, iolist_to_binary(datetime())),
|
||||
{noreply, heartbeat(State)};
|
||||
|
||||
|
|
@ -174,24 +179,6 @@ terminate(_Reason, #state{heartbeat = TRef1, ticker = TRef2}) ->
|
|||
%% Internal functions
|
||||
%%-----------------------------------------------------------------------------
|
||||
|
||||
uptime(#state{start_time = Ts}) ->
|
||||
Secs = timer:now_diff(erlang:timestamp(), Ts) div 1000000,
|
||||
lists:flatten(uptime(seconds, Secs)).
|
||||
uptime(seconds, Secs) when Secs < 60 ->
|
||||
[integer_to_list(Secs), " seconds"];
|
||||
uptime(seconds, Secs) ->
|
||||
[uptime(minutes, Secs div 60), integer_to_list(Secs rem 60), " seconds"];
|
||||
uptime(minutes, M) when M < 60 ->
|
||||
[integer_to_list(M), " minutes, "];
|
||||
uptime(minutes, M) ->
|
||||
[uptime(hours, M div 60), integer_to_list(M rem 60), " minutes, "];
|
||||
uptime(hours, H) when H < 24 ->
|
||||
[integer_to_list(H), " hours, "];
|
||||
uptime(hours, H) ->
|
||||
[uptime(days, H div 24), integer_to_list(H rem 24), " hours, "];
|
||||
uptime(days, D) ->
|
||||
[integer_to_list(D), " days, "].
|
||||
|
||||
publish(uptime, Uptime) ->
|
||||
safe_publish(systop(uptime), Uptime);
|
||||
publish(datetime, Datetime) ->
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ end_per_suite(_Config) ->
|
|||
application:unload(emqx),
|
||||
ok = emqx_logger:set_log_level(error),
|
||||
ok.
|
||||
|
||||
|
||||
% t_version(_) ->
|
||||
% error('TODO').
|
||||
|
||||
|
|
@ -42,10 +42,24 @@ end_per_suite(_Config) ->
|
|||
% error('TODO').
|
||||
|
||||
t_uptime(_) ->
|
||||
?assertEqual(<<"1 seconds">>, iolist_to_binary(emqx_sys:uptime(seconds, 1))),
|
||||
?assertEqual(<<"1 minutes, 0 seconds">>, iolist_to_binary(emqx_sys:uptime(seconds, 60))),
|
||||
?assertEqual(<<"1 hours, 0 minutes, 0 seconds">>, iolist_to_binary(emqx_sys:uptime(seconds, 3600))),
|
||||
?assertEqual(<<"1 days, 0 hours, 0 minutes, 0 seconds">>, iolist_to_binary(emqx_sys:uptime(seconds, 86400))).
|
||||
?assert(is_list(emqx_sys:uptime())),
|
||||
?assertEqual(<<"1 seconds">>, iolist_to_binary(emqx_sys:uptime(1))),
|
||||
?assertEqual(<<"1 minutes, 0 seconds">>, iolist_to_binary(emqx_sys:uptime(60))),
|
||||
?assertEqual(<<"1 hours, 0 minutes, 0 seconds">>, iolist_to_binary(emqx_sys:uptime(3600))),
|
||||
?assertEqual(<<"1 hours, 1 minutes, 1 seconds">>, iolist_to_binary(emqx_sys:uptime(3661))),
|
||||
?assertEqual(<<"1 days, 0 hours, 0 minutes, 0 seconds">>,
|
||||
iolist_to_binary(emqx_sys:uptime(86400))),
|
||||
lists:map(fun({D, H, M, S}) ->
|
||||
Expect = <<
|
||||
(integer_to_binary(D))/binary, " days, ",
|
||||
(integer_to_binary(H))/binary, " hours, ",
|
||||
(integer_to_binary(M))/binary, " minutes, ",
|
||||
(integer_to_binary(S))/binary, " seconds"
|
||||
>>,
|
||||
Actual = iolist_to_binary(emqx_sys:uptime(D * 86400 + H * 3600 + M * 60 + S)),
|
||||
?assertEqual(Expect, Actual)
|
||||
end,
|
||||
[{1, 2, 3, 4}, {10, 20, 30, 40}, {2222, 3, 56, 59}, {59, 23, 59, 59}]).
|
||||
|
||||
% t_datetime(_) ->
|
||||
% error('TODO').
|
||||
|
|
|
|||
Loading…
Reference in New Issue