indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Inbox debug

merge-requests/30/head
Bob Mottram 2022-03-12 17:25:25 +00:00
parent b9ea66bf5a
commit 3f1e5f38fb
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
daemon.py
View File

@ -1577,9 +1577,11 @@ class PubServer(BaseHTTPRequestHandler):
return True return True
def _update_inbox_queue(self, nickname: str, message_json: {}, def _update_inbox_queue(self, nickname: str, message_json: {},
message_bytes: str) -> int: message_bytes: str, debug: bool) -> int:
"""Update the inbox queue """Update the inbox queue
""" """
if debug:
if self.server.restart_inbox_queue_in_progress: if self.server.restart_inbox_queue_in_progress:
self._503() self._503()
print('INBOX: ' + print('INBOX: ' +
@ -19869,27 +19871,28 @@ class PubServer(BaseHTTPRequestHandler):
self.server.debug) self.server.debug)
if self.server.debug: if self.server.debug:
print('DEBUG: POST saving to inbox queue') print('INBOX: POST saving to inbox queue')
if users_in_path: if users_in_path:
path_users_section = self.path.split('/users/')[1] path_users_section = self.path.split('/users/')[1]
if '/' not in path_users_section: if '/' not in path_users_section:
if self.server.debug: if self.server.debug:
print('DEBUG: This is not a users endpoint') print('INBOX: This is not a users endpoint')
else: else:
self.post_to_nickname = path_users_section.split('/')[0] self.post_to_nickname = path_users_section.split('/')[0]
if self.post_to_nickname: if self.post_to_nickname:
queue_status = \ queue_status = \
self._update_inbox_queue(self.post_to_nickname, self._update_inbox_queue(self.post_to_nickname,
message_json, message_bytes) message_json, message_bytes,
self.server.debug)
if queue_status >= 0 and queue_status <= 3: if queue_status >= 0 and queue_status <= 3:
self.server.postreq_busy = False self.server.postreq_busy = False
return return
if self.server.debug: if self.server.debug:
print('_update_inbox_queue exited ' + print('INBOX: _update_inbox_queue exited ' +
'without doing anything') 'without doing anything')
else: else:
if self.server.debug: if self.server.debug:
print('self.post_to_nickname is None') print('INBOX: self.post_to_nickname is None')
self.send_response(403) self.send_response(403)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
@ -19897,10 +19900,11 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
if self.path == '/sharedInbox' or self.path == '/inbox': if self.path == '/sharedInbox' or self.path == '/inbox':
if self.server.debug: if self.server.debug:
print('DEBUG: POST to shared inbox') print('INBOX: POST to shared inbox')
queue_status = \ queue_status = \
self._update_inbox_queue('inbox', message_json, self._update_inbox_queue('inbox', message_json,
message_bytes) message_bytes,
self.server.debug)
if queue_status >= 0 and queue_status <= 3: if queue_status >= 0 and queue_status <= 3:
self.server.postreq_busy = False self.server.postreq_busy = False
return return