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

Tidying

merge-requests/30/head
Bob Mottram 2022-06-15 17:21:54 +01:00
parent 69db1c8213
commit cbac9f26a8
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
daemon.py
View File

@ -18649,7 +18649,6 @@ class PubServer(BaseHTTPRequestHandler):
def _receive_new_post_process(self, post_type: str, path: str, headers: {}, def _receive_new_post_process(self, post_type: str, path: str, headers: {},
length: int, post_bytes, boundary: str, length: int, post_bytes, boundary: str,
calling_domain: str, cookie: str, calling_domain: str, cookie: str,
authorized: bool,
content_license_url: str, content_license_url: str,
curr_session, proxy_type: str) -> int: curr_session, proxy_type: str) -> int:
# Note: this needs to happen synchronously # Note: this needs to happen synchronously
@ -19509,7 +19508,6 @@ class PubServer(BaseHTTPRequestHandler):
def _receive_new_post(self, post_type: str, path: str, def _receive_new_post(self, post_type: str, path: str,
calling_domain: str, cookie: str, calling_domain: str, cookie: str,
authorized: bool,
content_license_url: str, content_license_url: str,
curr_session, proxy_type: str) -> int: curr_session, proxy_type: str) -> int:
"""A new post has been created """A new post has been created
@ -19614,7 +19612,6 @@ class PubServer(BaseHTTPRequestHandler):
path, headers, length, path, headers, length,
post_bytes, boundary, post_bytes, boundary,
calling_domain, cookie, calling_domain, cookie,
authorized,
content_license_url, content_license_url,
curr_session, proxy_type) curr_session, proxy_type)
return page_number return page_number
@ -20347,7 +20344,6 @@ class PubServer(BaseHTTPRequestHandler):
page_number = \ page_number = \
self._receive_new_post(curr_post_type, self.path, self._receive_new_post(curr_post_type, self.path,
calling_domain, cookie, calling_domain, cookie,
authorized,
self.server.content_license_url, self.server.content_license_url,
curr_session, proxy_type) curr_session, proxy_type)
if page_number: if page_number:
@ -20646,7 +20642,7 @@ class PubServer(BaseHTTPRequestHandler):
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) self.server.debug)
if queue_status >= 0 and queue_status <= 3: if queue_status in range(0, 4):
self.server.postreq_busy = False self.server.postreq_busy = False
return return
if self.server.debug: if self.server.debug:
@ -20667,7 +20663,7 @@ class PubServer(BaseHTTPRequestHandler):
self._update_inbox_queue('inbox', message_json, self._update_inbox_queue('inbox', message_json,
message_bytes, message_bytes,
self.server.debug) self.server.debug)
if queue_status >= 0 and queue_status <= 3: if queue_status in range(0, 4):
self.server.postreq_busy = False self.server.postreq_busy = False
return return
self._200() self._200()
@ -20685,7 +20681,6 @@ class EpicyonServer(ThreadingHTTPServer):
if cls is ConnectionResetError: if cls is ConnectionResetError:
if e_ret.errno != errno.ECONNRESET: if e_ret.errno != errno.ECONNRESET:
print('ERROR: (EpicyonServer) ' + str(cls) + ", " + str(e_ret)) print('ERROR: (EpicyonServer) ' + str(cls) + ", " + str(e_ret))
pass
elif cls is BrokenPipeError: elif cls is BrokenPipeError:
pass pass
else: else: