mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only send one response

main
Bob Mottram 2020-04-16 11:14:05 +01:00
parent d21b584f78
commit d8aac0a273
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon.py
View File

@ -6967,11 +6967,6 @@ class PubServer(BaseHTTPRequestHandler):
queueStatus = \ queueStatus = \
self._updateInboxQueue(self.postToNickname, self._updateInboxQueue(self.postToNickname,
messageJson, messageBytes) messageJson, messageBytes)
if queueStatus == 0:
self.send_response(200)
self.end_headers()
self.server.POSTbusy = False
return
if queueStatus == 1: if queueStatus == 1:
self.send_response(503) self.send_response(503)
self.end_headers() self.end_headers()
@ -6992,11 +6987,6 @@ class PubServer(BaseHTTPRequestHandler):
print('DEBUG: POST to shared inbox') print('DEBUG: POST to shared inbox')
queueStatus = \ queueStatus = \
self._updateInboxQueue('inbox', messageJson, messageBytes) self._updateInboxQueue('inbox', messageJson, messageBytes)
if queueStatus == 0:
self.send_response(200)
self.end_headers()
self.server.POSTbusy = False
return
elif queueStatus == 1: elif queueStatus == 1:
self.send_response(503) self.send_response(503)
self.end_headers() self.end_headers()

4
inbox.py
View File

@ -2238,8 +2238,7 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
# heartbeat to monitor whether the inbox queue is running # heartbeat to monitor whether the inbox queue is running
heartBeatCtr += 5 heartBeatCtr += 5
if heartBeatCtr >= 10: if heartBeatCtr >= 10:
print('>>> Heartbeat Q:' + print('>>> Heartbeat Q:' + str(len(queue)) + ' ' +
str(len(queue)) + ' ' +
'{:%F %T}'.format(datetime.datetime.now())) '{:%F %T}'.format(datetime.datetime.now()))
heartBeatCtr = 0 heartBeatCtr = 0
@ -2250,6 +2249,7 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
queueRestoreCtr = 0 queueRestoreCtr = 0
restoreQueueItems(baseDir, queue) restoreQueueItems(baseDir, queue)
continue continue
currTime = int(time.time()) currTime = int(time.time())
# recreate the session periodically # recreate the session periodically