aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test/telnet_server.erl
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-12-02 10:39:40 +0100
committerHenrik Nord <[email protected]>2014-12-02 10:39:40 +0100
commit506a78a32112e64d8cc328e461fc588a07c3b8b4 (patch)
tree7a83755885bbe7d48b1275f8320a7cd9985027f6 /lib/common_test/test/telnet_server.erl
parent079ffcc3f7fa3de171e472eb32eee07280b82ccc (diff)
parent6852931e4460ad44aaa8d97bafdb4df3b2a5fee2 (diff)
downloadotp-506a78a32112e64d8cc328e461fc588a07c3b8b4.tar.gz
otp-506a78a32112e64d8cc328e461fc588a07c3b8b4.tar.bz2
otp-506a78a32112e64d8cc328e461fc588a07c3b8b4.zip
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/test/telnet_server.erl')
-rw-r--r--lib/common_test/test/telnet_server.erl12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/common_test/test/telnet_server.erl b/lib/common_test/test/telnet_server.erl
index 0a23a66324..d25ee62d38 100644
--- a/lib/common_test/test/telnet_server.erl
+++ b/lib/common_test/test/telnet_server.erl
@@ -310,4 +310,14 @@ get_line([],_) ->
dbg(_F) ->
dbg(_F,[]).
dbg(_F,_A) ->
- io:format("[telnet_server] " ++ _F,_A).
+ TS = timestamp(),
+ io:format("[telnet_server, ~s]\n" ++ _F,[TS|_A]).
+
+timestamp() ->
+ {MS,S,US} = now(),
+ {{Year,Month,Day}, {Hour,Min,Sec}} =
+ calendar:now_to_local_time({MS,S,US}),
+ MilliSec = trunc(US/1000),
+ lists:flatten(io_lib:format("~4.10.0B-~2.10.0B-~2.10.0B "
+ "~2.10.0B:~2.10.0B:~2.10.0B.~3.10.0B",
+ [Year,Month,Day,Hour,Min,Sec,MilliSec])).