diff options
| author | Badlop <badlop@process-one.net> | 2021-05-19 14:51:03 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2021-05-19 15:00:19 +0200 |
| commit | 58a623778f53d9d5b747c24d37c1d9aa2a3c8796 (patch) | |
| tree | e01a24151d304f3b5faea3169fbbbffaf4f0a878 /src | |
| parent | Show mnesia table memory in bytes, not in words (diff) | |
Show uptime date in WebAdmin, it's easier to understand that uptime seconds
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_web_admin.erl | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl index 543cd28e5..341db47de 100644 --- a/src/ejabberd_web_admin.erl +++ b/src/ejabberd_web_admin.erl @@ -1354,6 +1354,7 @@ get_node(global, Node, [<<"stats">>], _Query, Lang) -> [wall_clock]), UpTimeS = (str:format("~.3f", [element(1, UpTime) / 1000])), + UpTimeDate = uptime_date(Node), CPUTime = ejabberd_cluster:call(Node, erlang, statistics, [runtime]), CPUTimeS = (str:format("~.3f", [element(1, CPUTime) / 1000])), @@ -1375,6 +1376,10 @@ get_node(global, Node, [<<"stats">>], _Query, Lang) -> ?XAC(<<"td">>, [{<<"class">>, <<"alignright">>}], UpTimeS)]), ?XE(<<"tr">>, + [?X(<<"td">>), + ?XAC(<<"td">>, [{<<"class">>, <<"alignright">>}], + UpTimeDate)]), + ?XE(<<"tr">>, [?XCT(<<"td">>, ?T("CPU Time:")), ?XAC(<<"td">>, [{<<"class">>, <<"alignright">>}], CPUTimeS)]), @@ -1468,6 +1473,16 @@ get_node(Host, Node, NPath, Query, Lang) -> _ -> Res end. +uptime_date(Node) -> + Localtime = ejabberd_cluster:call(Node, erlang, localtime, []), + Now = calendar:datetime_to_gregorian_seconds(Localtime), + {Wall, _} = ejabberd_cluster:call(Node, erlang, statistics, [wall_clock]), + LastRestart = Now - (Wall div 1000), + {{Year, Month, Day}, {Hour, Minute, Second}} = + calendar:gregorian_seconds_to_datetime(LastRestart), + str:format("~w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w", + [Year, Month, Day, Hour, Minute, Second]). + %%%================================== %%%% node parse |