Fixed stats crawler (run on raw server)

NielsZeilemaker · Dec 16, 2013 · ba1632c · ba1632c
1 parent 4559109
commit ba1632c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Tribler/community/anontunnel/StatsCrawler.py b/Tribler/community/anontunnel/StatsCrawler.py
@@ -62,11 +62,13 @@ def init_sql():
         self.raw_server.add_task(init_sql)
 
     def on_tunnel_stats(self,  community, candidate, stats):
+        self.raw_server.add_task(lambda: self.on_stats(community, candidate, stats))
+
+    def on_stats(self, community, candidate, stats):
         sock_address = candidate.sock_addr
         cursor = self.conn.cursor()
 
         try:
-
             cursor.execute('''INSERT OR FAIL INTO result
                                 (session_id, time, host, port, swift_size, swift_time, bytes_enter, bytes_exit, bytes_returned)
                                 VALUES (?,DATETIME('now'),?,?,?,?,?,?,?)''',
@@ -98,7 +100,7 @@ def on_tunnel_stats(self,  community, candidate, stats):
 
             logger.warning("Storing stats data off %s:%d" % sock_address)
         except sqlite3.IntegrityError:
-            logger.info("Already stored this stat")
+            logger.error("Already stored this stat")
         except BaseException as e:
             logger.exception(e)
 

diff --git a/Tribler/community/anontunnel/community.py b/Tribler/community/anontunnel/community.py
@@ -33,7 +33,7 @@
 
 class ProxySettings:
     def __init__(self):
-        length = randint(1, 4)
+        length = 1#randint(1, 4)
 
         self.extend_strategy = ExtendStrategies.TrustThyNeighbour
         self.select_strategy = RandomSelectionStrategy(1)
@@ -47,7 +47,7 @@ def on_state_change(self, community, state):
     def on_tunnel_data(self, community, origin, data):
         pass
 
-    def on_stats(self, community, candidate, stats):
+    def on_tunnel_stats(self, community, candidate, stats):
         pass
 
 class Circuit:
@@ -299,7 +299,7 @@ def on_introduction_response(self, messages):
     def on_stats(self, messages):
         for message in messages:
             for o in self.__observers:
-                o.on_stats(self, message.candidate, message.payload.stats)
+                o.on_tunnel_stats(self, message.candidate, message.payload.stats)
 
     def send_stats(self, stats):
         meta = self.get_meta_message(u"stats")