lobo/wttr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

cache.py: add timestamp to each entry

Browse source
This commit is contained in:
Igor Chubin 2020-04-30 11:20:32 +02:00
parent 0d5f6c298c
commit 192e633607
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lib/cache.py
View file

@ -7,6 +7,7 @@ import re
import time import time
import os import os
import hashlib import hashlib
import random
import pytz import pytz
import pylru import pylru
@ -35,9 +36,8 @@ def get_signature(user_agent, query_string, client_ip_address, lang):
`lang`, and `client_ip_address` `lang`, and `client_ip_address`
""" """
timestamp = int(time.time() / 1000) signature = "%s:%s:%s:%s" % \
signature = "%s:%s:%s:%s:%s" % \ (user_agent, query_string, client_ip_address, lang)
(user_agent, query_string, client_ip_address, lang, timestamp)
print(signature) print(signature)
return signature return signature
@ -48,8 +48,13 @@ def get(signature):
the `_update_answer` function. the `_update_answer` function.
""" """
value = CACHE.get(signature) value_record = CACHE.get(signature)
if value: if not value_record:
return None
value = value_record["val"]
expiry = value_record["expiry"]
if value and time.time() < expiry:
if value.startswith("file:") or value.startswith("bfile:"): if value.startswith("file:") or value.startswith("bfile:"):
value = _read_from_file(signature, sighash=value) value = _read_from_file(signature, sighash=value)
if not value: if not value:
@ -57,14 +62,26 @@ def get(signature):
return _update_answer(value) return _update_answer(value)
return None return None
def _randint(minimum, maximum):
return random.randrange(maximum - minimum)
def store(signature, value): def store(signature, value):
""" """
Store in cache `value` for `signature` Store in cache `value` for `signature`
""" """
if len(value) < MIN_SIZE_FOR_FILECACHE:
CACHE[signature] = value if len(value) >= MIN_SIZE_FOR_FILECACHE:
value_to_store = _store_in_file(signature, value)
else: else:
CACHE[signature] = _store_in_file(signature, value) value_to_store = value
value_record = {
"val": value_to_store,
"expiry": time.time() + _randint(1000, 2000)*1000,
}
CACHE[signature] = value_record
return _update_answer(value) return _update_answer(value)
def _hash(signature): def _hash(signature):