r196 - in /debtorrent/trunk: DebTorrent/BT1/HTTPDownloader.py DebTorrent/BT1/Rerequester.py DebTorrent/BT1/track.py DebTorrent/HTTPCache.py debtorrent-client.py

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

Author: camrdale-guest
Date: Sat Aug  4 04:45:21 2007
New Revision: 196

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=196
Log:
Name each of the threads for logging purposes.

Modified:
    debtorrent/trunk/DebTorrent/BT1/HTTPDownloader.py
    debtorrent/trunk/DebTorrent/BT1/Rerequester.py
    debtorrent/trunk/DebTorrent/BT1/track.py
    debtorrent/trunk/DebTorrent/HTTPCache.py
    debtorrent/trunk/debtorrent-client.py

Modified: debtorrent/trunk/DebTorrent/BT1/HTTPDownloader.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/HTTPDownloader.py?rev=196&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/HTTPDownloader.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/HTTPDownloader.py Sat Aug  4 04:45:21 2007
@@ -218,7 +218,7 @@
                 del self.headers['Range']
             if self.request_size < length:
                 self.headers['Range'] = 'bytes=' + self._request_ranges(start, end)
-            rq = Thread(target = self._request)
+            rq = Thread(target = self._request, name = 'HTTPDownloader.SingleDownload._request')
             rq.setDaemon(False)
             rq.start()
             self.active = True

Modified: debtorrent/trunk/DebTorrent/BT1/Rerequester.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/Rerequester.py?rev=196&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/Rerequester.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/Rerequester.py Sat Aug  4 04:45:21 2007
@@ -443,7 +443,8 @@
             self.sched(retry,5)         # retry in 5 seconds
             return
         self.lock.reset()
-        rq = Thread(target = self._rerequest, args = [s, callback])
+        rq = Thread(target = self._rerequest, args = [s, callback],
+                    name = 'Rerequester._rerequest')
         rq.setDaemon(False)
         rq.start()
 
@@ -523,7 +524,8 @@
         """
         
         l = self.lock.set()
-        rq = Thread(target = self._rerequest_single, args = [t, s+get_key(t), l, callback])
+        rq = Thread(target = self._rerequest_single, args = [t, s+get_key(t), l, callback],
+                    name = 'Rerequester._rerequest_single')
         rq.setDaemon(False)
         rq.start()
         self.lock.wait()

Modified: debtorrent/trunk/DebTorrent/BT1/track.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/track.py?rev=196&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/track.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/track.py Sat Aug  4 04:45:21 2007
@@ -568,7 +568,7 @@
         url = self.aggregate_forward+'?'+query
         if self.aggregate_password is not None:
             url += '&password='+self.aggregate_password
-        rq = Thread(target = self._aggregate_senddata, args = [url])
+        rq = Thread(target = self._aggregate_senddata, args = [url], name = 'Tracker._aggregate_senddata')
         rq.setDaemon(False)
         rq.start()
 
@@ -1483,7 +1483,7 @@
 
         # Create the root handler (removing any others)
         hdlr = logging.FileHandler(outfilename, 'a')
-        hdlr.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(message)s'))
+        hdlr.setFormatter(logging.Formatter('%(asctime)s %(threadName)s %(levelname)s %(module)s %(name)s %(message)s'))
         for h in logging.root.handlers:
             logging.root.removeHandler(h)
         logging.root.addHandler(hdlr)

Modified: debtorrent/trunk/DebTorrent/HTTPCache.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/HTTPCache.py?rev=196&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/HTTPCache.py (original)
+++ debtorrent/trunk/DebTorrent/HTTPCache.py Sat Aug  4 04:45:21 2007
@@ -85,7 +85,7 @@
         self.headers = {'User-Agent': VERSION}
         self.active = False
         logging.info('CacheRequest: downloading '+self.url)
-        rq = Thread(target = self._request)
+        rq = Thread(target = self._request, name = 'HTTPCache.CacheRequest._request')
         rq.setDaemon(False)
         rq.start()
         self.active = True

Modified: debtorrent/trunk/debtorrent-client.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debtorrent-client.py?rev=196&op=diff
==============================================================================
--- debtorrent/trunk/debtorrent-client.py (original)
+++ debtorrent/trunk/debtorrent-client.py Sat Aug  4 04:45:21 2007
@@ -57,7 +57,7 @@
         
         # Create the root handler (removing any others)
         hdlr = logging.FileHandler(outfilename, 'a')
-        hdlr.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(message)s'))
+        hdlr.setFormatter(logging.Formatter('%(asctime)s %(threadName)s %(levelname)s %(module)s %(name)s %(message)s'))
         for h in logging.root.handlers:
             logging.root.removeHandler(h)
         logging.root.addHandler(hdlr)