aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/test/snmp_test_mgr.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-01-17 16:34:22 +0100
committerMicael Karlberg <[email protected]>2012-01-17 16:34:22 +0100
commit531d9e60f84192da2e163077d062f5ec8027a78c (patch)
treee6aa27199150bfcac01cae6ef55d533a551a3ce4 /lib/snmp/test/snmp_test_mgr.erl
parentf3675ad3cbb3915b450311b202bea2118fca3d37 (diff)
parent3ed3e64fb9a2b9227ce8d8c9f47f7f324d46690f (diff)
downloadotp-531d9e60f84192da2e163077d062f5ec8027a78c.tar.gz
otp-531d9e60f84192da2e163077d062f5ec8027a78c.tar.bz2
otp-531d9e60f84192da2e163077d062f5ec8027a78c.zip
Merge branch 'bmk/snmp/snmp4215_integration/r14' into bmk/snmp/snmp4215_integration/r15
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/doc/src/notes_history.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
Diffstat (limited to 'lib/snmp/test/snmp_test_mgr.erl')
-rw-r--r--lib/snmp/test/snmp_test_mgr.erl15
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/snmp/test/snmp_test_mgr.erl b/lib/snmp/test/snmp_test_mgr.erl
index 84bdc6b04f..499cf7abcf 100644
--- a/lib/snmp/test/snmp_test_mgr.erl
+++ b/lib/snmp/test/snmp_test_mgr.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -1124,16 +1124,11 @@ d(F,A) -> d(get(debug),F,A).
d(true,F,A) ->
io:format("*** [~s] MGR_DBG *** " ++ F ++ "~n",
- [format_timestamp(now())|A]);
+ [formated_timestamp()|A]);
d(_,_F,_A) ->
ok.
-format_timestamp({_N1, _N2, N3} = Now) ->
- {Date, Time} = calendar:now_to_datetime(Now),
- {YYYY,MM,DD} = Date,
- {Hour,Min,Sec} = Time,
- FormatDate =
- io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
- [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
- lists:flatten(FormatDate).
+
+formated_timestamp() ->
+ snmp_test_lib:formated_timestamp().