diff options
| author | Erland Schönbeck <[email protected]> | 2015-03-05 13:37:16 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-20 15:28:54 +0100 |
| commit | 1132117b38cfe33e770a0d5b1a782d48667427c4 (patch) | |
| tree | c40c3da27e2f10a3c50cd5a2b4dc8d9db03aa08b /lib/inets/src/tftp/tftp_logger.erl | |
| parent | 403fe576cd71bf32c7e42b782bf3181d809bbc88 (diff) | |
| download | otp-1132117b38cfe33e770a0d5b1a782d48667427c4.tar.gz otp-1132117b38cfe33e770a0d5b1a782d48667427c4.tar.bz2 otp-1132117b38cfe33e770a0d5b1a782d48667427c4.zip | |
Use new time API and be back-compatible in inets
Remove unused functions and removed redundant test
Diffstat (limited to 'lib/inets/src/tftp/tftp_logger.erl')
| -rw-r--r-- | lib/inets/src/tftp/tftp_logger.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/inets/src/tftp/tftp_logger.erl b/lib/inets/src/tftp/tftp_logger.erl index 0c3620e665..aa449682ce 100644 --- a/lib/inets/src/tftp/tftp_logger.erl +++ b/lib/inets/src/tftp/tftp_logger.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2009. All Rights Reserved. +%% Copyright Ericsson AB 2008-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 @@ -84,7 +84,13 @@ info_msg(Format, Data) -> %%------------------------------------------------------------------- add_timestamp(Format, Data) -> - Now = {_MegaSecs, _Secs, _MicroSecs} = erlang:now(), + %% Adapt to new OTP 18 erlang time API and be back-compatible + Now = try + erlang:timestamp() + catch + error:undef -> + erlang:now() + end, {{_Y, _Mo, _D}, {H, Mi, S}} = calendar:now_to_universal_time(Now), %% {"~p-~s-~sT~s:~s:~sZ,~6.6.0w tftp: " ++ Format ++ "\n", %% [Y, t(Mo), t(D), t(H), t(Mi), t(S), MicroSecs | Data]}. |