From 10add6220631e208e3b54c1cb5e5a2e4e32c4055 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Mon, 13 Jun 2022 11:56:07 +0200
Subject: [PATCH] refactor: expose rfc3339 datetime string

---
 apps/emqx/src/emqx_sys.erl                  |  7 +------
 apps/emqx_management/src/emqx_mgmt_util.erl | 22 ---------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/apps/emqx/src/emqx_sys.erl b/apps/emqx/src/emqx_sys.erl
index 70ab7e3c5..2b1f87746 100644
--- a/apps/emqx/src/emqx_sys.erl
+++ b/apps/emqx/src/emqx_sys.erl
@@ -119,12 +119,7 @@ uptime() ->
 %% @doc Get sys datetime
 -spec datetime() -> string().
 datetime() ->
-    {{Y, M, D}, {H, MM, S}} = calendar:local_time(),
-    lists:flatten(
-        io_lib:format(
-            "~4..0w-~2..0w-~2..0w ~2..0w:~2..0w:~2..0w", [Y, M, D, H, MM, S]
-        )
-    ).
+    calendar:system_time_to_rfc3339(erlang:system_time(), [{unit, nanosecond}]).
 
 sys_interval() ->
     emqx:get_config([sys_topics, sys_msg_interval]).
diff --git a/apps/emqx_management/src/emqx_mgmt_util.erl b/apps/emqx_management/src/emqx_mgmt_util.erl
index 07e0c00fb..61d12cf69 100644
--- a/apps/emqx_management/src/emqx_mgmt_util.erl
+++ b/apps/emqx_management/src/emqx_mgmt_util.erl
@@ -17,8 +17,6 @@
 -module(emqx_mgmt_util).
 
 -export([
-    strftime/1,
-    datetime/1,
     kmg/1,
     ntoa/1,
     merge_maps/2,
@@ -51,26 +49,6 @@
 -define(MB, (1024 * 1024)).
 -define(GB, (1024 * 1024 * 1024)).
 
-%%--------------------------------------------------------------------
-%% Strftime
-%%--------------------------------------------------------------------
-
-strftime({MegaSecs, Secs, _MicroSecs}) ->
-    strftime(datetime(MegaSecs * 1000000 + Secs));
-strftime(Secs) when is_integer(Secs) ->
-    strftime(datetime(Secs));
-strftime({{Y, M, D}, {H, MM, S}}) ->
-    lists:flatten(
-        io_lib:format(
-            "~4..0w-~2..0w-~2..0w ~2..0w:~2..0w:~2..0w", [Y, M, D, H, MM, S]
-        )
-    ).
-
-datetime(Timestamp) when is_integer(Timestamp) ->
-    Epoch = calendar:datetime_to_gregorian_seconds({{1970, 1, 1}, {0, 0, 0}}),
-    Universal = calendar:gregorian_seconds_to_datetime(Timestamp + Epoch),
-    calendar:universal_time_to_local_time(Universal).
-
 kmg(Byte) when Byte > ?GB ->
     kmg(Byte / ?GB, "G");
 kmg(Byte) when Byte > ?MB ->