Use full domain

master
Bob Mottram 2019-08-08 09:51:32 +01:00
parent 21ed27209a
commit 00b6eeed00
1 changed files with 2 additions and 9 deletions

View File

@ -260,14 +260,11 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.debug: if self.server.debug:
pprint(messageJson) pprint(messageJson)
print('DEBUG: savePostToBox') print('DEBUG: savePostToBox')
domainFull=self.server.domain
if self.server.port!=80 and self.server.port!=443:
domainFull=self.server.domain+':'+str(self.server.port)
savePostToBox(self.server.baseDir, \ savePostToBox(self.server.baseDir, \
self.server.httpPrefix, \ self.server.httpPrefix, \
postId, \ postId, \
self.postToNickname, \ self.postToNickname, \
domainFull,messageJson,'outbox') self.server.domainFull,messageJson,'outbox')
if outboxAnnounce(self.server.baseDir,messageJson,self.server.debug): if outboxAnnounce(self.server.baseDir,messageJson,self.server.debug):
if self.server.debug: if self.server.debug:
print('DEBUG: Updated announcements (shares) collection for the post associated with the Announce activity') print('DEBUG: Updated announcements (shares) collection for the post associated with the Announce activity')
@ -362,17 +359,13 @@ class PubServer(BaseHTTPRequestHandler):
if len(self.server.inboxQueue)>=self.server.maxQueueLength: if len(self.server.inboxQueue)>=self.server.maxQueueLength:
print('Inbox queue is full') print('Inbox queue is full')
return 1 return 1
domainFull=self.server.domain
if self.server.port!=80 and self.server.port!=443:
domainFull=self.server.domain+':'+str(self.server.port)
# save the json for later queue processing # save the json for later queue processing
queueFilename = \ queueFilename = \
savePostToInboxQueue(self.server.baseDir, \ savePostToInboxQueue(self.server.baseDir, \
self.server.httpPrefix, \ self.server.httpPrefix, \
nickname, \ nickname, \
domainFull, \ self.server.domainFull, \
messageJson, messageJson,
self.headers['host'], self.headers['host'],
self.headers['signature'], self.headers['signature'],