From 63d8c4ed124a5caa83ea60a7447e897ea49c06d7 Mon Sep 17 00:00:00 2001
From: itsikkes <itsikkes@users.noreply.github.com>
Date: Tue, 26 Jul 2016 18:52:25 +0300
Subject: [PATCH] DB queries fix

Modification time relevant for UI updating accordingly.
---
 monkey_island/cc/admin/ui/index.html |  2 +-
 monkey_island/cc/main.py             | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/monkey_island/cc/admin/ui/index.html b/monkey_island/cc/admin/ui/index.html
index c2a8eb2a1..237a99266 100644
--- a/monkey_island/cc/admin/ui/index.html
+++ b/monkey_island/cc/admin/ui/index.html
@@ -84,7 +84,7 @@
                 <div id="info" class="panel-body panel-collapse collapse in">
                     <div>
                         Num of Monkeys: <label id="infoNumOfMonkeys">0</label> (<label id="infoNumOfParents">0</label> exploiting were done)<br/>
-                        Monkyes Alive: <label id="infoNumOfAlive">0</label><br/>
+                        Monkeys Alive: <label id="infoNumOfAlive">0</label><br/>
                         Num of Hosts Not Exploited: <label id="infoNumOfHosts">0</label><br/>
                         Num of Tunnels Used: <label id="infoNumOfTunnels">0</label><br/>
                     </div>
diff --git a/monkey_island/cc/main.py b/monkey_island/cc/main.py
index ea4c55b35..f552a26a5 100644
--- a/monkey_island/cc/main.py
+++ b/monkey_island/cc/main.py
@@ -165,20 +165,20 @@ class Telemetry(restful.Resource):
                     host = telemetry_json['data'].split(":")[-2].replace("//", "")
                     tunnel_host = mongo.db.monkey.find_one({"ip_addresses": host})
                     mongo.db.monkey.update({"guid": telemetry_json['monkey_guid']},
-                                           {'$set': {'tunnel_guid': tunnel_host.get('guid')}},
+                                           {'$set': {'tunnel_guid': tunnel_host.get('guid'), 'modifytime': datetime.now()}},
                                            upsert=False)
                 else:
                     mongo.db.monkey.update({"guid": telemetry_json['monkey_guid']},
-                                           {'$unset': {'tunnel_guid': ''}},
+                                           {'$unset': {'tunnel_guid': ''}, 'modifytime': datetime.now()},
                                            upsert=False)
             elif telemetry_json.get('telem_type') == 'state':
                 if telemetry_json['data']['done']:
                     mongo.db.monkey.update({"guid": telemetry_json['monkey_guid']},
-                                           {'$set': {'dead': True}},
+                                           {'$set': {'dead': True, 'modifytime': datetime.now()}},
                                            upsert=False)
                 else:
                     mongo.db.monkey.update({"guid": telemetry_json['monkey_guid']},
-                                           {'$set': {'dead': False}},
+                                           {'$set': {'dead': False, 'modifytime': datetime.now()}},
                                            upsert=False)
         except:
             pass
@@ -272,7 +272,7 @@ def output_json(obj, code, headers=None):
 def update_dead_monkeys():
     mongo.db.monkey.update(
         {'keepalive': {'$lte': datetime.now() - timedelta(minutes=10)}, 'dead': {'$ne': True}},
-        {'$set': {'dead': True, 'modifytime': datetime.now()}}, upsert=False)
+        {'$set': {'dead': True, 'modifytime': datetime.now()}}, upsert=False, multi=True)
 
 
 @app.route('/admin/<path:path>')