r215 - /debtorrent/trunk/DebTorrent/BT1/Downloader.py

[camrdale-guest at users.alioth.debian.org]

Author: camrdale-guest
Date: Fri Aug 10 03:58:03 2007
New Revision: 215

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=215
Log:
Automatically expire disconnected seeds.

Modified:
    debtorrent/trunk/DebTorrent/BT1/Downloader.py

Modified: debtorrent/trunk/DebTorrent/BT1/Downloader.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/Downloader.py?rev=215&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/Downloader.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/Downloader.py Fri Aug 10 03:58:03 2007
@@ -827,18 +827,10 @@
 #        if not self.disconnectedseeds.has_key(id):
 #            self.picker.seed_seen_recently()
         self.disconnectedseeds[id]=clock()
-
-#    def expire_disconnected_seeds(self):
-
-    def num_disconnected_seeds(self):
-        """Expire old disconnected seeds and calculate the recent number.
-        
-        @rtype: C{int}
-        @return: the number of recently seen disconnected seeds
-        
-        """
-        
-        # first expire old ones
+        self.expire_disconnected_seeds()
+
+    def expire_disconnected_seeds(self):
+        """Expire old disconnected seeds."""
         expired = []
         for id,t in self.disconnectedseeds.items():
             if clock() - t > EXPIRE_TIME:     #Expire old seeds after so long
@@ -846,9 +838,18 @@
         for id in expired:
 #            self.picker.seed_disappeared()
             del self.disconnectedseeds[id]
+
+    def num_disconnected_seeds(self):
+        """Calculate the number or recently seen seeds.
+        
+        @rtype: C{int}
+        @return: the number of recently seen disconnected seeds
+        
+        """
+        
+        # first expire old ones
+        self.expire_disconnected_seeds()
         return len(self.disconnectedseeds)
-        # if this isn't called by a stats-gathering function
-        # it should be scheduled to run every minute or two.
 
     def _check_kicks_ok(self):
         """Check whether peers can be kicked for bad data.