Make thread reaper more tolerant; see issue #1367

mailpile · Aug 6, 2015 · 22cf671 · 22cf671
1 parent a277ffc
commit 22cf671
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/mailpile/crypto/gpgi.py b/mailpile/crypto/gpgi.py
@@ -589,11 +589,12 @@ def run(self,
         return gpg_retcode, self.outputbuffers
 
     def _reap_threads(self):
-        for name, thr in self.threads.iteritems():
-            if thr.isAlive():
-                thr.join(timeout=15)
+        for tries in (1, 2, 3):
+            for name, thr in self.threads.iteritems():
                 if thr.isAlive():
-                    print 'SCARY WARNING: FAILED TO REAP THREAD %s' % thr
+                    thr.join(timeout=15)
+                    if thr.isAlive() and tries > 1:
+                        print 'WARNING: Failed to reap thread %s' % thr
 
     def parse_status(self, line, *args):
         self.debug('<<STATUS<< %s' % line)