Limit the number of inserted placeholders.

Otherwise, if period=1m and grace=1m then we can end up generating huge useless tables.
This commit is contained in:
Pēteris Caune 2016-01-03 18:24:46 +02:00
parent 1e3285423f
commit 8e8d9abe3b

View File

@ -215,9 +215,11 @@ def log(request, code):
# Fill in "missed ping" placeholders: # Fill in "missed ping" placeholders:
expected_date = older.created + check.timeout expected_date = older.created + check.timeout
while expected_date + check.grace < newer.created: limit = 0
while expected_date + check.grace < newer.created and limit < 10:
wrapped.append({"placeholder_date": expected_date}) wrapped.append({"placeholder_date": expected_date})
expected_date = expected_date + check.timeout expected_date = expected_date + check.timeout
limit += 1
# Prepare early flag for next ping to come # Prepare early flag for next ping to come
early = older.created + check.timeout > newer.created + check.grace early = older.created + check.timeout > newer.created + check.grace