Changeset 10

Timestamp:

05/25/07 03:07:53 (2 years ago)

Author:

amcgregor

Message:

Merge patch from #5, with documentation.

Files:

• trunk/turbomail/pool.py (modified) (2 diffs)

trunk/turbomail/pool.py

@@ -60 +60 @@
                 log.debug("Thread pool created.")
         
-        def enqueue(self, work):
+        def enqueue(self, work, block=True, timeout=None):
                 """Enqueue a Message instance.
                 
@@ -69 +69 @@
                              instance of the Message class or subclass.
                 @type work: callable
+                
+                @param block: Block code execution until there is a free slot in
+                              the queue.  If I{block} is True and I{timeout} is
+                              None, block indefinately.
+                @type block: bool
+                
+                @param timeout: How long to block execution (in seconds).  If
+                                the timeout expires (or block is false and the
+                                queue is full) raise the Full exception.
+                @type timeout: int
                 """
 
                 if callable(work):
-                        self._queue.put(work())
+                        self._queue.put(work(), block=block, timeout=timeout)
                 else:
-                        self._queue.put(work)
+                        self._queue.put(work, block=block, timeout=timeout)
                 
                 optimum_threads = min(self._threads, math.ceil(self._queue.qsize() / float(self._jobs)))