From 407c1e4c8595eefdd5eb6fbf943ad73d2cfd8866 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 3 Sep 2019 20:27:40 +0100 Subject: [PATCH] Don't use threads for everything --- daemon.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon.py b/daemon.py index 87d7d2adc..6f192c49a 100644 --- a/daemon.py +++ b/daemon.py @@ -1996,7 +1996,7 @@ class PubServer(BaseHTTPRequestHandler): fields['replyTo'], fields['replyTo'],fields['subject']) if messageJson: self.postToNickname=nickname - if self._postToOutboxThread(messageJson): + if self._postToOutbox(messageJson): populateReplies(self.server.baseDir, \ self.server.httpPrefix, \ self.server.domainFull, \ @@ -2018,7 +2018,7 @@ class PubServer(BaseHTTPRequestHandler): fields['replyTo'], fields['replyTo'],fields['subject']) if messageJson: self.postToNickname=nickname - if self._postToOutboxThread(messageJson): + if self._postToOutbox(messageJson): populateReplies(self.server.baseDir, \ self.server.httpPrefix, \ self.server.domain, \ @@ -2040,7 +2040,7 @@ class PubServer(BaseHTTPRequestHandler): fields['replyTo'], fields['replyTo'],fields['subject']) if messageJson: self.postToNickname=nickname - if self._postToOutboxThread(messageJson): + if self._postToOutbox(messageJson): populateReplies(self.server.baseDir, \ self.server.httpPrefix, \ self.server.domain, \ @@ -2069,7 +2069,7 @@ class PubServer(BaseHTTPRequestHandler): self.postToNickname=nickname if self.server.debug: print('DEBUG: new DM to '+str(messageJson['object']['to'])) - if self._postToOutboxThread(messageJson): + if self._postToOutbox(messageJson): populateReplies(self.server.baseDir, \ self.server.httpPrefix, \ self.server.domain, \ @@ -2099,7 +2099,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.debug,fields['subject']) if messageJson: self.postToNickname=nickname - if self._postToOutboxThread(messageJson): + if self._postToOutbox(messageJson): return 1 else: return -1 @@ -3185,7 +3185,7 @@ class PubServer(BaseHTTPRequestHandler): # https://www.w3.org/TR/activitypub/#object-without-create if self.outboxAuthenticated: - if self._postToOutboxThread(messageJson): + if self._postToOutbox(messageJson): if messageJson.get('id'): self.headers['Location']= \ messageJson['id'].replace('/activity','').replace('/undo','')