diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-02-09 10:18:08 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-02-09 10:18:08 +0100 |
| commit | 33156218401ba0ba489d0d787367af82f56c5f3c (patch) | |
| tree | 853cfb2b408c5c4f8ffa36a27d10f7612da2ca0e /lib | |
| parent | bca4b9783e9f2d6845b970f23f1b2f9a0ded7121 (diff) | |
| parent | 450773958165539951cd431a9233ce7666ec20e2 (diff) | |
| download | otp-33156218401ba0ba489d0d787367af82f56c5f3c.tar.gz otp-33156218401ba0ba489d0d787367af82f56c5f3c.tar.bz2 otp-33156218401ba0ba489d0d787367af82f56c5f3c.zip | |
Merge branch 'ia/ssl/timestamp' into maint
* ia/ssl/timestamp:
ssl: erlang:timestamp -> os:timestamp
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/ssl_manager.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl index 692938cf3f..f2d82a66d3 100644 --- a/lib/ssl/src/ssl_manager.erl +++ b/lib/ssl/src/ssl_manager.erl @@ -225,7 +225,7 @@ init([Name, Opts]) -> session_cache_cb = CacheCb, session_lifetime = SessionLifeTime, session_validation_timer = Timer, - last_pem_check = erlang:timestamp(), + last_pem_check = os:timestamp(), clear_pem_cache = Interval }}. @@ -346,7 +346,7 @@ handle_info({delayed_clean_session, Key}, #state{session_cache = Cache, handle_info(clear_pem_cache, #state{certificate_db = [_,_,PemChace], clear_pem_cache = Interval, last_pem_check = CheckPoint} = State) -> - NewCheckPoint = erlang:timestamp(), + NewCheckPoint = os:timestamp(), start_pem_cache_validator(PemChace, CheckPoint), erlang:send_after(Interval, self(), clear_pem_cache), {noreply, State#state{last_pem_check = NewCheckPoint}}; |