diff options
| author | Micael Karlberg <[email protected]> | 2012-01-12 14:36:25 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-01-12 14:36:25 +0100 |
| commit | fdf31ed028c3cf27387debd1efff3f1e649cd451 (patch) | |
| tree | bde23761a1b92b6da29f8fa51abaee2c4700a5db /lib/snmp/test/snmp_test_lib.erl | |
| parent | c634c9c5f022c7f8ba91e1ef9d8fede838153f3a (diff) | |
| parent | 40f968c06136e6268575daab02cfd6bd26f95fc6 (diff) | |
| download | otp-fdf31ed028c3cf27387debd1efff3f1e649cd451.tar.gz otp-fdf31ed028c3cf27387debd1efff3f1e649cd451.tar.bz2 otp-fdf31ed028c3cf27387debd1efff3f1e649cd451.zip | |
Merge branch 'bmk/snmp/agent/synchronizing_vacm_dumping/r14/OTP-9851' into bmk/snmp/snmp4215_integration/r14
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
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). |