diff options
| author | Lars Thorsen <[email protected]> | 2016-05-18 15:23:31 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2016-05-18 15:23:31 +0200 |
| commit | c8cd6f30021d5f28e06d89a6acf834d770b9e972 (patch) | |
| tree | b80f97812a4c4db4a291b332457b17cd140d0213 /lib/inets/src/tftp/tftp_logger.erl | |
| parent | a1086ac00ece8044b4055047aaac2f912a5ca18e (diff) | |
| parent | 121fc1f2bcc75f974d3dc4ff6a1af5f2b0cd0492 (diff) | |
| download | otp-c8cd6f30021d5f28e06d89a6acf834d770b9e972.tar.gz otp-c8cd6f30021d5f28e06d89a6acf834d770b9e972.tar.bz2 otp-c8cd6f30021d5f28e06d89a6acf834d770b9e972.zip | |
Merge branch 'lars/inets-deprecated-now/OTP-12441'
* lars/inets-deprecated-now/OTP-12441:
[inets] Remove calls to the inets_time_compat module
[inets] Remove usage of erlang:now()
Diffstat (limited to 'lib/inets/src/tftp/tftp_logger.erl')
| -rw-r--r-- | lib/inets/src/tftp/tftp_logger.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/tftp/tftp_logger.erl b/lib/inets/src/tftp/tftp_logger.erl index 5e5d1d56c7..a869958484 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-2015. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -85,7 +85,7 @@ info_msg(Format, Data) -> %%------------------------------------------------------------------- add_timestamp(Format, Data) -> - Time = inets_time_compat:timestamp(), + Time = erlang:timestamp(), {{_Y, _Mo, _D}, {H, Mi, S}} = calendar:now_to_universal_time(Time), %% {"~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]}. |