diff options
author | Erik Johnston <erik@matrix.org> | 2017-06-07 11:05:23 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-06-07 11:05:23 +0100 |
commit | 09e4bc05016a37f70111c4e54df10c9f070e8ba4 (patch) | |
tree | e5cc39f79c3d855716c859c3e71969ae704a2054 /synapse/storage/client_ips.py | |
parent | Remove spurious log lines (diff) | |
parent | Increase size of IP cache (diff) | |
download | synapse-09e4bc05016a37f70111c4e54df10c9f070e8ba4.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_fixup
Diffstat (limited to 'synapse/storage/client_ips.py')
-rw-r--r-- | synapse/storage/client_ips.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/storage/client_ips.py b/synapse/storage/client_ips.py index 747d2df622..014ab635b7 100644 --- a/synapse/storage/client_ips.py +++ b/synapse/storage/client_ips.py @@ -20,6 +20,8 @@ from twisted.internet import defer from ._base import Cache from . import background_updates +import os + logger = logging.getLogger(__name__) # Number of msec of granularity to store the user IP 'last seen' time. Smaller @@ -28,12 +30,15 @@ logger = logging.getLogger(__name__) LAST_SEEN_GRANULARITY = 120 * 1000 +CACHE_SIZE_FACTOR = float(os.environ.get("SYNAPSE_CACHE_FACTOR", 0.1)) + + class ClientIpStore(background_updates.BackgroundUpdateStore): def __init__(self, hs): self.client_ip_last_seen = Cache( name="client_ip_last_seen", keylen=4, - max_entries=5000, + max_entries=50000 * CACHE_SIZE_FACTOR, ) super(ClientIpStore, self).__init__(hs) |