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

Fixed bugs pulling parameters

This commit is contained in:
acepace 2016-06-14 14:39:58 +03:00
parent 20e4793c0e
commit 92ba526265
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
monkey_island/cc/main.py
View File

@ -50,7 +50,7 @@ mongo = PyMongo(app)
class Monkey(restful.Resource): class Monkey(restful.Resource):
def get(self, **kw): def get(self, **kw):
guid = kw.get('guid') guid = request.args.get('guid')
timestamp = request.args.get('timestamp') timestamp = request.args.get('timestamp')
if guid: if guid:
@ -118,14 +118,19 @@ class Monkey(restful.Resource):
class Telemetry(restful.Resource): class Telemetry(restful.Resource):
def get(self, **kw): def get(self, **kw):
monkey_guid = kw.get('monkey_guid') monkey_guid = request.args.get('monkey_guid')
telem_type = request.args.get('telem_type')
timestamp = request.args.get('timestamp') timestamp = request.args.get('timestamp')
if "null" == timestamp: #special case to avoid ugly JS code...
timestamp = None
result = {'timestamp': datetime.now().isoformat()} result = {'timestamp': datetime.now().isoformat()}
find_filter = {} find_filter = {}
if monkey_guid: if monkey_guid:
find_filter["monkey_guid"] = {'$eq': monkey_guid} find_filter["monkey_guid"] = {'$eq': monkey_guid}
if telem_type:
find_filter["telem_type"] = {'$eq': telem_type}
if timestamp: if timestamp:
find_filter['timestamp'] = {'$gt': dateutil.parser.parse(timestamp)} find_filter['timestamp'] = {'$gt': dateutil.parser.parse(timestamp)}