aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/misc/snmp_verbosity.erl
diff options
context:
space:
mode:
authorErland Schönbeck <[email protected]>2015-04-28 13:32:55 +0200
committerErland Schönbeck <[email protected]>2015-04-28 13:32:55 +0200
commit22173c2e4d65e47039975b91015560ae4256b3c1 (patch)
tree807470de259e85483b79b40e6e8f85c89608b982 /lib/snmp/src/misc/snmp_verbosity.erl
parent861145a503c77d8144033f38d288bdda31699edd (diff)
parent722357d7a23ee4a47277f05aa5fd593bc4de0db0 (diff)
downloadotp-22173c2e4d65e47039975b91015560ae4256b3c1.tar.gz
otp-22173c2e4d65e47039975b91015560ae4256b3c1.tar.bz2
otp-22173c2e4d65e47039975b91015560ae4256b3c1.zip
Merge branch 'erland/OTP18/snmp/OTP-12452'
* erland/OTP18/snmp/OTP-12452: snmp: Remove deprecated warning for erlang:now in snmp_verbority snmp: Change to random use crypto. Remove use of erlang:now
Diffstat (limited to 'lib/snmp/src/misc/snmp_verbosity.erl')
-rw-r--r--lib/snmp/src/misc/snmp_verbosity.erl5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/snmp/src/misc/snmp_verbosity.erl b/lib/snmp/src/misc/snmp_verbosity.erl
index f27c31db03..c9192158ef 100644
--- a/lib/snmp/src/misc/snmp_verbosity.erl
+++ b/lib/snmp/src/misc/snmp_verbosity.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2000-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2015. 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
@@ -69,7 +69,7 @@ print2(_Verbosity,Format,Arguments) ->
timestamp() ->
- format_timestamp(now()).
+ format_timestamp(os:timestamp()).
format_timestamp({_N1, _N2, N3} = Now) ->
{Date, Time} = calendar:now_to_datetime(Now),
@@ -162,4 +162,3 @@ validate(log) -> log;
validate(debug) -> debug;
validate(trace) -> trace;
validate(_) -> silence.
-