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

Snake case

merge-requests/30/head
Bob Mottram 2021-12-25 23:18:10 +00:00
parent 7359e81582
commit 80e0ae1702
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
daemon.py
View File

@ -17229,25 +17229,25 @@ class PubServer(BaseHTTPRequestHandler):
path = path.split('?page=')[0] path = path.split('?page=')[0]
# get the username who posted # get the username who posted
newPostThreadName = None new_post_thread_name = None
if '/users/' in path: if '/users/' in path:
newPostThreadName = path.split('/users/')[1] new_post_thread_name = path.split('/users/')[1]
if '/' in newPostThreadName: if '/' in new_post_thread_name:
newPostThreadName = newPostThreadName.split('/')[0] new_post_thread_name = new_post_thread_name.split('/')[0]
if not newPostThreadName: if not new_post_thread_name:
newPostThreadName = '*' new_post_thread_name = '*'
if self.server.newPostThread.get(newPostThreadName): if self.server.new_post_thread.get(new_post_thread_name):
print('Waiting for previous new post thread to end') print('Waiting for previous new post thread to end')
waitCtr = 0 waitCtr = 0
while (self.server.newPostThread[newPostThreadName].is_alive() and np_thread = self.server.new_post_thread[new_post_thread_name]
waitCtr < 8): while np_thread.is_alive() and waitCtr < 8:
time.sleep(1) time.sleep(1)
waitCtr += 1 waitCtr += 1
if waitCtr >= 8: if waitCtr >= 8:
print('Killing previous new post thread for ' + print('Killing previous new post thread for ' +
newPostThreadName) new_post_thread_name)
self.server.newPostThread[newPostThreadName].kill() np_thread.kill()
# make a copy of self.headers # make a copy of self.headers
headers = {} headers = {}
@ -17298,7 +17298,7 @@ class PubServer(BaseHTTPRequestHandler):
# Note sending new posts needs to be synchronous, # Note sending new posts needs to be synchronous,
# otherwise any attachments can get mangled if # otherwise any attachments can get mangled if
# other events happen during their decoding # other events happen during their decoding
print('Creating new post from: ' + newPostThreadName) print('Creating new post from: ' + new_post_thread_name)
self._receiveNewPostProcess(postType, self._receiveNewPostProcess(postType,
path, headers, length, path, headers, length,
postBytes, boundary, postBytes, boundary,
@ -18718,7 +18718,7 @@ def runDaemon(content_license_url: str,
httpd.enable_shared_inbox = enable_shared_inbox httpd.enable_shared_inbox = enable_shared_inbox
httpd.outboxThread = {} httpd.outboxThread = {}
httpd.outbox_thread_index = {} httpd.outbox_thread_index = {}
httpd.newPostThread = {} httpd.new_post_thread = {}
httpd.project_version = project_version httpd.project_version = project_version
httpd.secure_mode = secure_mode httpd.secure_mode = secure_mode
# max POST size of 30M # max POST size of 30M