aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_session_cache.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-12-07 10:35:19 +0100
committerIngela Anderton Andin <[email protected]>2015-12-07 10:35:19 +0100
commitf258633921e7dd0bd5760281d2a26a0f937e53c4 (patch)
tree8c6e16902035cbf583c1325c84bfb8f2b118f8cc /lib/ssl/src/ssl_session_cache.erl
parent1d1677c2a85ebce0ada828d254c7a1122b825e0a (diff)
parent55569124ac815eedc21c234c447e346b97f3c8fe (diff)
downloadotp-f258633921e7dd0bd5760281d2a26a0f937e53c4.tar.gz
otp-f258633921e7dd0bd5760281d2a26a0f937e53c4.tar.bz2
otp-f258633921e7dd0bd5760281d2a26a0f937e53c4.zip
Merge branch 'ia/ssl/max-sessions/OTP-12392' into maint
* ia/ssl/max-sessions/OTP-12392: ssl: Fix documentation mistakes ssl: Add upper limit for session cache ssl: Measure elapsed time with erlang:monotonic_time
Diffstat (limited to 'lib/ssl/src/ssl_session_cache.erl')
-rw-r--r--lib/ssl/src/ssl_session_cache.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_session_cache.erl b/lib/ssl/src/ssl_session_cache.erl
index cfc48cd935..9585e613e6 100644
--- a/lib/ssl/src/ssl_session_cache.erl
+++ b/lib/ssl/src/ssl_session_cache.erl
@@ -27,7 +27,7 @@
-include("ssl_internal.hrl").
-export([init/1, terminate/1, lookup/2, update/3, delete/2, foldl/3,
- select_session/2]).
+ select_session/2, size/1]).
%%--------------------------------------------------------------------
%% Description: Return table reference. Called by ssl_manager process.
@@ -86,6 +86,12 @@ select_session(Cache, PartialKey) ->
[{{{PartialKey,'_'}, '$1'},[],['$1']}]).
%%--------------------------------------------------------------------
+%% Description: Returns the cache size
+%%--------------------------------------------------------------------
+size(Cache) ->
+ ets:info(Cache, size).
+
+%%--------------------------------------------------------------------
%%% Internal functions
%%--------------------------------------------------------------------
cache_name(Name) ->