From 28ea6ce3421ed09b292bb5af579e2656fd054885 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 5 Aug 2019 23:38:38 +0100
Subject: [PATCH] Limited number of retries to read inbox queue files

---
 inbox.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/inbox.py b/inbox.py
index a605cc7a0..c5b80e38d 100644
--- a/inbox.py
+++ b/inbox.py
@@ -995,6 +995,11 @@ def runInboxQueue(baseDir: str,httpPrefix: str,sendThreads: [],postLog: [], \
         'domains': {},
         'accounts': {}
     }
+
+    # keep track of the number of queue item read failures
+    # so that if a file is corrupt then it will eventually
+    # be ignored rather than endlessly retried
+    itemReadFailed=0
     
     while True:
         time.sleep(1)
@@ -1020,9 +1025,16 @@ def runInboxQueue(baseDir: str,httpPrefix: str,sendThreads: [],postLog: [], \
                 with open(queueFilename, 'r') as fp:
                     queueJson=commentjson.load(fp)
             except:
-                print('WARN: Failed to load inbox queue item '+queueFilename)
+                itemReadFailed+=1
+                print('WARN: Failed to load inbox queue item '+queueFilename+' (try '+str(itemReadFailed)+')')
+                if itemReadFailed>4:
+                    # After a few tries we can assume that the file
+                    # is probably corrupt/unreadable
+                    queue.pop(0)
+                    itemReadFailed=0
                 continue
-
+            itemReadFailed=0
+            
             # clear the daily quotas for maximum numbers of received posts
             if currTime-quotasLastUpdate>60*60*24:
                 quotas={