diff options
| author | Erlang/OTP <[email protected]> | 2012-01-16 11:55:58 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2012-01-16 11:55:58 +0100 |
| commit | ffd9f3c009ff53fc4d1c1f59b04d72702524413c (patch) | |
| tree | 8e5c57c2930a7f12c2be78e194cc650bdccf15a9 /lib/snmp/test/snmp_test_lib.erl | |
| parent | 021d5c2e49e623d4f43c0cc88a097bc99f3564e6 (diff) | |
| parent | 3ed3e64fb9a2b9227ce8d8c9f47f7f324d46690f (diff) | |
| download | otp-ffd9f3c009ff53fc4d1c1f59b04d72702524413c.tar.gz otp-ffd9f3c009ff53fc4d1c1f59b04d72702524413c.tar.bz2 otp-ffd9f3c009ff53fc4d1c1f59b04d72702524413c.zip | |
Merge branch 'bmk/snmp/snmp4215_integration/r14' into maint-r14
* bmk/snmp/snmp4215_integration/r14:
[snmp] Fixed release notes. Used wrong ticket number
[snmp/agent] Updated appup file
[snmp/agent] Updated release notes
[snmp/agent] Removed the (unused) serializer part
[snmp/agent] Use unique temporary file name during vacm table dumnping
[snmp/agent] Add common timestamp format function.
[snmp/agent] Synchronization feature added
[snmp/agent] Creating a unique temporary file whe dumping vacm
[snmp/agent] Changed version
[snmp/agent] Found another old-style fun (2-tuple)
[snmp/agent] Removed use of old style tuple funs
Diffstat (limited to 'lib/snmp/test/snmp_test_lib.erl')
| -rw-r--r-- | lib/snmp/test/snmp_test_lib.erl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl index 54839d989b..e4d58a1253 100644 --- a/lib/snmp/test/snmp_test_lib.erl +++ b/lib/snmp/test/snmp_test_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2010. All Rights Reserved. +%% Copyright Ericsson AB 2002-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 @@ -37,7 +37,7 @@ -export([watchdog/3, watchdog_start/1, watchdog_start/2, watchdog_stop/1]). -export([del_dir/1]). -export([cover/1]). --export([p/2, print/5]). +-export([p/2, print/5, formated_timestamp/0]). %% ---------------------------------------------------------------------- @@ -521,15 +521,18 @@ p(F, A) when is_list(F) andalso is_list(A) -> print(Prefix, Module, Line, Format, Args) -> io:format("*** [~s] ~s ~p ~p ~p:~p *** " ++ Format ++ "~n", - [format_timestamp(now()), + [formated_timestamp(), Prefix, node(), self(), Module, Line|Args]). +formated_timestamp() -> + format_timestamp(os:timestamp()). + 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", + io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w ~w", [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]), lists:flatten(FormatDate). |