From efae85a1feab45dd93c8569a66ce04ac7daedbf9 Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@gmail.com>
Date: Mon, 18 Aug 2014 15:36:19 -0400
Subject: [PATCH] Move thread spawning code to worker class.

---
 earwigbot/wiki/copyvios/__init__.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/earwigbot/wiki/copyvios/__init__.py b/earwigbot/wiki/copyvios/__init__.py
index 08cf182..4e3fa14 100644
--- a/earwigbot/wiki/copyvios/__init__.py
+++ b/earwigbot/wiki/copyvios/__init__.py
@@ -106,10 +106,7 @@ class _CopyvioWorkspace(object):
                     self._logger.debug(logmsg.format("NEW", key, url))
                     worker = _CopyvioWorker(*self._worker_args)
                     worker.queue.put(url)
-                    thread = Thread(target=worker.run)
-                    thread.name = "cvworker-" + key.encode("utf8")
-                    thread.daemon = True
-                    thread.start()
+                    worker.start(key.encode("utf8"))
                     self._workers[key] = worker
 
     def wait(self):
@@ -138,6 +135,7 @@ class _CopyvioWorker(object):
     def __init__(self, workspace, until, headers, url_timeout):
         self.queue = Queue()
 
+        self._thread = None
         self._workspace = workspace
         self._until = until
         self._opener = build_opener()
@@ -180,8 +178,8 @@ class _CopyvioWorker(object):
         else:
             return None
 
-    def run(self):
-        """Main entry point for the worker.
+    def _run(self):
+        """Main entry point for the worker thread.
 
         We will keep fetching URLs from the queue and handling them until
         either we run out of time, or we get an exit signal that the queue is
@@ -204,6 +202,17 @@ class _CopyvioWorker(object):
             if text:
                 self._workspace.compare(url, MarkovChain(text))
 
+    def start(self, name):
+        """Start the worker in a new thread, with a given name."""
+        self._thread = thread = Thread(target=self._run)
+        thread.name = "cvworker-" + name
+        thread.daemon = True
+        thread.start()
+
+    def join(self):
+        """Join to the worker thread, blocking until it finishes."""
+        self._thread.join()
+
 
 class CopyvioMixIn(object):
     """