p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

The bug was found, TTL now works! 

should have been utcnow(). see  https://stackoverflow.com/questions/55994379/mongodb-ttl-index-doesnt-delete-expired-documents

Feature was tested locally and works!
This commit is contained in:
Shay Nehmad 2019-05-07 15:58:05 +03:00
parent 0e4dbfb078
commit 00a4ffd028
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
monkey/monkey_island/cc/resources/monkey.py
View File

@ -10,6 +10,8 @@ from monkey_island.cc.database import mongo
from monkey_island.cc.services.config import ConfigService from monkey_island.cc.services.config import ConfigService
from monkey_island.cc.services.node import NodeService from monkey_island.cc.services.node import NodeService
MONKEY_TTL_EXPIRY_DURATION_IN_SECONDS = 30
__author__ = 'Barak' __author__ = 'Barak'
# TODO: separate logic from interface # TODO: separate logic from interface
@ -49,7 +51,9 @@ class Monkey(flask_restful.Resource):
NodeService.set_monkey_tunnel(monkey["_id"], tunnel_host_ip) NodeService.set_monkey_tunnel(monkey["_id"], tunnel_host_ip)
# The TTL data uses the new `models` module which depends on mongoengine. # The TTL data uses the new `models` module which depends on mongoengine.
current_ttl = MonkeyTtl(expire_at=datetime.now() + timedelta(seconds=30)) # Using UTC to make the mongodb TTL feature work. See
# https://stackoverflow.com/questions/55994379/mongodb-ttl-index-doesnt-delete-expired-documents.
current_ttl = MonkeyTtl(expire_at=datetime.utcnow() + timedelta(seconds=MONKEY_TTL_EXPIRY_DURATION_IN_SECONDS))
current_ttl.save() current_ttl.save()
update['$set']['ttl_ref'] = current_ttl.id update['$set']['ttl_ref'] = current_ttl.id