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

Performance monitoring of announce button

merge-requests/30/head
Bob Mottram 2021-10-20 19:37:57 +01:00
parent e9bb9748c4
commit 549ddab68c
1 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
daemon.py
View File

@ -390,7 +390,7 @@ def saveDomainQrcode(baseDir: str, httpPrefix: str,
class PubServer(BaseHTTPRequestHandler): class PubServer(BaseHTTPRequestHandler):
protocol_version = 'HTTP/1.1' protocol_version = 'HTTP/1.1'
def _getInstalceUrl(self, callingDomain: str) -> str: def _getInstanceUrl(self, callingDomain: str) -> str:
"""Returns the URL for this instance """Returns the URL for this instance
""" """
if callingDomain.endswith('.onion') and \ if callingDomain.endswith('.onion') and \
@ -1067,7 +1067,7 @@ class PubServer(BaseHTTPRequestHandler):
if brochMode: if brochMode:
showNodeInfoAccounts = False showNodeInfoAccounts = False
instanceUrl = self._getInstalceUrl(callingDomain) instanceUrl = self._getInstanceUrl(callingDomain)
aboutUrl = instanceUrl + '/about' aboutUrl = instanceUrl + '/about'
termsOfServiceUrl = instanceUrl + '/terms' termsOfServiceUrl = instanceUrl + '/terms'
info = metaDataNodeInfo(self.server.baseDir, info = metaDataNodeInfo(self.server.baseDir,
@ -1728,7 +1728,7 @@ class PubServer(BaseHTTPRequestHandler):
""" """
usersPath = path.replace('/moderationaction', '') usersPath = path.replace('/moderationaction', '')
nickname = usersPath.replace('/users/', '') nickname = usersPath.replace('/users/', '')
actorStr = self._getInstalceUrl(callingDomain) + usersPath actorStr = self._getInstanceUrl(callingDomain) + usersPath
if not isModerator(self.server.baseDir, nickname): if not isModerator(self.server.baseDir, nickname):
self._redirect_headers(actorStr + '/moderation', self._redirect_headers(actorStr + '/moderation',
cookie, callingDomain) cookie, callingDomain)
@ -2946,7 +2946,7 @@ class PubServer(BaseHTTPRequestHandler):
path = path.split('?page=')[0] path = path.split('?page=')[0]
usersPath = path.replace('/searchhandle', '') usersPath = path.replace('/searchhandle', '')
actorStr = self._getInstalceUrl(callingDomain) + usersPath actorStr = self._getInstanceUrl(callingDomain) + usersPath
length = int(self.headers['Content-length']) length = int(self.headers['Content-length'])
try: try:
searchParams = self.rfile.read(length).decode('utf-8') searchParams = self.rfile.read(length).decode('utf-8')
@ -3118,7 +3118,7 @@ class PubServer(BaseHTTPRequestHandler):
if searchStr.endswith(':') or \ if searchStr.endswith(':') or \
searchStr.endswith(';') or \ searchStr.endswith(';') or \
searchStr.endswith('.'): searchStr.endswith('.'):
actorStr = self._getInstalceUrl(callingDomain) + usersPath actorStr = self._getInstanceUrl(callingDomain) + usersPath
self._redirect_headers(actorStr + '/search', self._redirect_headers(actorStr + '/search',
cookie, callingDomain) cookie, callingDomain)
self.server.POSTbusy = False self.server.POSTbusy = False
@ -3217,7 +3217,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.POSTbusy = False self.server.POSTbusy = False
return return
else: else:
actorStr = self._getInstalceUrl(callingDomain) + usersPath actorStr = self._getInstanceUrl(callingDomain) + usersPath
self._redirect_headers(actorStr + '/search', self._redirect_headers(actorStr + '/search',
cookie, callingDomain) cookie, callingDomain)
self.server.POSTbusy = False self.server.POSTbusy = False
@ -3289,7 +3289,7 @@ class PubServer(BaseHTTPRequestHandler):
self._write(msg) self._write(msg)
self.server.POSTbusy = False self.server.POSTbusy = False
return return
actorStr = self._getInstalceUrl(callingDomain) + usersPath actorStr = self._getInstanceUrl(callingDomain) + usersPath
self._redirect_headers(actorStr + '/' + self._redirect_headers(actorStr + '/' +
self.server.defaultTimeline, self.server.defaultTimeline,
cookie, callingDomain) cookie, callingDomain)
@ -3686,7 +3686,7 @@ class PubServer(BaseHTTPRequestHandler):
""" """
usersPath = path.replace('/linksdata', '') usersPath = path.replace('/linksdata', '')
usersPath = usersPath.replace('/editlinks', '') usersPath = usersPath.replace('/editlinks', '')
actorStr = self._getInstalceUrl(callingDomain) + usersPath actorStr = self._getInstanceUrl(callingDomain) + usersPath
if ' boundary=' in self.headers['Content-type']: if ' boundary=' in self.headers['Content-type']:
boundary = self.headers['Content-type'].split('boundary=')[1] boundary = self.headers['Content-type'].split('boundary=')[1]
if ';' in boundary: if ';' in boundary:
@ -3817,7 +3817,7 @@ class PubServer(BaseHTTPRequestHandler):
self._404() self._404()
return return
usersPath = usersPath.split('/tags/')[0] usersPath = usersPath.split('/tags/')[0]
actorStr = self._getInstalceUrl(callingDomain) + usersPath actorStr = self._getInstanceUrl(callingDomain) + usersPath
tagScreenStr = actorStr + '/tags/' + hashtag tagScreenStr = actorStr + '/tags/' + hashtag
if ' boundary=' in self.headers['Content-type']: if ' boundary=' in self.headers['Content-type']:
boundary = self.headers['Content-type'].split('boundary=')[1] boundary = self.headers['Content-type'].split('boundary=')[1]
@ -3900,7 +3900,7 @@ class PubServer(BaseHTTPRequestHandler):
""" """
usersPath = path.replace('/newswiredata', '') usersPath = path.replace('/newswiredata', '')
usersPath = usersPath.replace('/editnewswire', '') usersPath = usersPath.replace('/editnewswire', '')
actorStr = self._getInstalceUrl(callingDomain) + usersPath actorStr = self._getInstanceUrl(callingDomain) + usersPath
if ' boundary=' in self.headers['Content-type']: if ' boundary=' in self.headers['Content-type']:
boundary = self.headers['Content-type'].split('boundary=')[1] boundary = self.headers['Content-type'].split('boundary=')[1]
if ';' in boundary: if ';' in boundary:
@ -4023,7 +4023,7 @@ class PubServer(BaseHTTPRequestHandler):
update button on the citations screen update button on the citations screen
""" """
usersPath = path.replace('/citationsdata', '') usersPath = path.replace('/citationsdata', '')
actorStr = self._getInstalceUrl(callingDomain) + usersPath actorStr = self._getInstanceUrl(callingDomain) + usersPath
nickname = getNicknameFromActor(actorStr) nickname = getNicknameFromActor(actorStr)
citationsFilename = \ citationsFilename = \
@ -4108,7 +4108,7 @@ class PubServer(BaseHTTPRequestHandler):
""" """
usersPath = path.replace('/newseditdata', '') usersPath = path.replace('/newseditdata', '')
usersPath = usersPath.replace('/editnewspost', '') usersPath = usersPath.replace('/editnewspost', '')
actorStr = self._getInstalceUrl(callingDomain) + usersPath actorStr = self._getInstanceUrl(callingDomain) + usersPath
if ' boundary=' in self.headers['Content-type']: if ' boundary=' in self.headers['Content-type']:
boundary = self.headers['Content-type'].split('boundary=')[1] boundary = self.headers['Content-type'].split('boundary=')[1]
if ';' in boundary: if ';' in boundary:
@ -4244,7 +4244,7 @@ class PubServer(BaseHTTPRequestHandler):
""" """
usersPath = path.replace('/profiledata', '') usersPath = path.replace('/profiledata', '')
usersPath = usersPath.replace('/editprofile', '') usersPath = usersPath.replace('/editprofile', '')
actorStr = self._getInstalceUrl(callingDomain) + usersPath actorStr = self._getInstanceUrl(callingDomain) + usersPath
if ' boundary=' in self.headers['Content-type']: if ' boundary=' in self.headers['Content-type']:
boundary = self.headers['Content-type'].split('boundary=')[1] boundary = self.headers['Content-type'].split('boundary=')[1]
if ';' in boundary: if ';' in boundary:
@ -6847,13 +6847,16 @@ class PubServer(BaseHTTPRequestHandler):
if not self.postToNickname: if not self.postToNickname:
print('WARN: unable to find nickname in ' + actor) print('WARN: unable to find nickname in ' + actor)
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self._getInstalceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
actorPathStr = \ actorPathStr = \
actorAbsolute + '/' + timelineStr + \ actorAbsolute + '/' + timelineStr + \
'?page=' + str(pageNumber) '?page=' + str(pageNumber)
self._redirect_headers(actorPathStr, cookie, self._redirect_headers(actorPathStr, cookie,
callingDomain) callingDomain)
return return
fitnessPerformance(GETstartTime, self.server.fitness,
'_GET', '_announceButton1',
self.server.debug)
if not self.server.session: if not self.server.session:
print('Starting new session during repeat button') print('Starting new session during repeat button')
self.server.session = createSession(proxyType) self.server.session = createSession(proxyType)
@ -6863,6 +6866,9 @@ class PubServer(BaseHTTPRequestHandler):
self._404() self._404()
self.server.GETbusy = False self.server.GETbusy = False
return return
fitnessPerformance(GETstartTime, self.server.fitness,
'_GET', '_announceButton2',
self.server.debug)
self.server.actorRepeat = path.split('?actor=')[1] self.server.actorRepeat = path.split('?actor=')[1]
announceToStr = \ announceToStr = \
localActorUrl(httpPrefix, self.postToNickname, domainFull) + \ localActorUrl(httpPrefix, self.postToNickname, domainFull) + \
@ -6885,6 +6891,9 @@ class PubServer(BaseHTTPRequestHandler):
debug, debug,
self.server.projectVersion, self.server.projectVersion,
self.server.signingPrivateKeyPem) self.server.signingPrivateKeyPem)
fitnessPerformance(GETstartTime, self.server.fitness,
'_GET', '_announceButton3',
self.server.debug)
announceFilename = None announceFilename = None
if announceJson: if announceJson:
# save the announce straight to the outbox # save the announce straight to the outbox
@ -6896,6 +6905,10 @@ class PubServer(BaseHTTPRequestHandler):
self.postToNickname, domainFull, self.postToNickname, domainFull,
announceJson, 'outbox') announceJson, 'outbox')
fitnessPerformance(GETstartTime, self.server.fitness,
'_GET', '_announceButton4',
self.server.debug)
# clear the icon from the cache so that it gets updated # clear the icon from the cache so that it gets updated
if self.server.iconsCache.get('repeat.png'): if self.server.iconsCache.get('repeat.png'):
del self.server.iconsCache['repeat.png'] del self.server.iconsCache['repeat.png']
@ -6903,6 +6916,10 @@ class PubServer(BaseHTTPRequestHandler):
# send out the announce within a separate thread # send out the announce within a separate thread
self._postToOutboxThread(announceJson) self._postToOutboxThread(announceJson)
fitnessPerformance(GETstartTime, self.server.fitness,
'_GET', '_announceButton5',
self.server.debug)
# generate the html for the announce # generate the html for the announce
if announceJson and announceFilename: if announceJson and announceFilename:
if debug: if debug:
@ -6910,6 +6927,9 @@ class PubServer(BaseHTTPRequestHandler):
cachedPostFilename = \ cachedPostFilename = \
getCachedPostFilename(baseDir, self.postToNickname, getCachedPostFilename(baseDir, self.postToNickname,
domain, announceJson) domain, announceJson)
fitnessPerformance(GETstartTime, self.server.fitness,
'_GET', '_announceButton6',
self.server.debug)
if debug: if debug:
print('Announced post json: ' + str(announceJson)) print('Announced post json: ' + str(announceJson))
print('Announced post nickname: ' + print('Announced post nickname: ' +
@ -6920,6 +6940,9 @@ class PubServer(BaseHTTPRequestHandler):
followerApprovalActive(baseDir, followerApprovalActive(baseDir,
self.postToNickname, domain) self.postToNickname, domain)
showRepeats = not isDM(announceJson) showRepeats = not isDM(announceJson)
fitnessPerformance(GETstartTime, self.server.fitness,
'_GET', '_announceButton7',
self.server.debug)
individualPostAsHtml(self.server.signingPrivateKeyPem, False, individualPostAsHtml(self.server.signingPrivateKeyPem, False,
self.server.recentPostsCache, self.server.recentPostsCache,
self.server.maxRecentPosts, self.server.maxRecentPosts,
@ -6946,9 +6969,12 @@ class PubServer(BaseHTTPRequestHandler):
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False) False, True, False)
fitnessPerformance(GETstartTime, self.server.fitness,
'_GET', '_announceButton8',
self.server.debug)
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self._getInstalceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
actorPathStr = \ actorPathStr = \
actorAbsolute + '/' + timelineStr + '?page=' + \ actorAbsolute + '/' + timelineStr + '?page=' + \
str(pageNumber) + timelineBookmark str(pageNumber) + timelineBookmark
@ -6999,7 +7025,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.postToNickname: if not self.postToNickname:
print('WARN: unable to find nickname in ' + actor) print('WARN: unable to find nickname in ' + actor)
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self._getInstalceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
actorPathStr = \ actorPathStr = \
actorAbsolute + '/' + timelineStr + '?page=' + \ actorAbsolute + '/' + timelineStr + '?page=' + \
str(pageNumber) str(pageNumber)
@ -7055,7 +7081,7 @@ class PubServer(BaseHTTPRequestHandler):
self._postToOutboxThread(newUndoAnnounce) self._postToOutboxThread(newUndoAnnounce)
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self._getInstalceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
actorPathStr = \ actorPathStr = \
actorAbsolute + '/' + timelineStr + '?page=' + \ actorAbsolute + '/' + timelineStr + '?page=' + \
str(pageNumber) + timelineBookmark str(pageNumber) + timelineBookmark
@ -7315,7 +7341,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.postToNickname: if not self.postToNickname:
print('WARN: unable to find nickname in ' + actor) print('WARN: unable to find nickname in ' + actor)
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self._getInstalceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
actorPathStr = \ actorPathStr = \
actorAbsolute + '/' + timelineStr + \ actorAbsolute + '/' + timelineStr + \
'?page=' + str(pageNumber) + timelineBookmark '?page=' + str(pageNumber) + timelineBookmark
@ -7433,7 +7459,7 @@ class PubServer(BaseHTTPRequestHandler):
likeUrl) likeUrl)
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self._getInstalceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
actorPathStr = \ actorPathStr = \
actorAbsolute + '/' + timelineStr + \ actorAbsolute + '/' + timelineStr + \
'?page=' + str(pageNumber) + timelineBookmark '?page=' + str(pageNumber) + timelineBookmark
@ -7480,7 +7506,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.postToNickname: if not self.postToNickname:
print('WARN: unable to find nickname in ' + actor) print('WARN: unable to find nickname in ' + actor)
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self._getInstalceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
actorPathStr = \ actorPathStr = \
actorAbsolute + '/' + timelineStr + \ actorAbsolute + '/' + timelineStr + \
'?page=' + str(pageNumber) '?page=' + str(pageNumber)
@ -7589,7 +7615,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.iconsCache.get('like_inactive.png'): if self.server.iconsCache.get('like_inactive.png'):
del self.server.iconsCache['like_inactive.png'] del self.server.iconsCache['like_inactive.png']
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self._getInstalceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
actorPathStr = \ actorPathStr = \
actorAbsolute + '/' + timelineStr + \ actorAbsolute + '/' + timelineStr + \
'?page=' + str(pageNumber) + timelineBookmark '?page=' + str(pageNumber) + timelineBookmark
@ -7637,7 +7663,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.postToNickname: if not self.postToNickname:
print('WARN: unable to find nickname in ' + actor) print('WARN: unable to find nickname in ' + actor)
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self._getInstalceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
actorPathStr = \ actorPathStr = \
actorAbsolute + '/' + timelineStr + \ actorAbsolute + '/' + timelineStr + \
'?page=' + str(pageNumber) '?page=' + str(pageNumber)
@ -7722,7 +7748,7 @@ class PubServer(BaseHTTPRequestHandler):
print('WARN: Bookmarked post not found: ' + bookmarkFilename) print('WARN: Bookmarked post not found: ' + bookmarkFilename)
# self._postToOutbox(bookmarkJson, self.server.projectVersion, None) # self._postToOutbox(bookmarkJson, self.server.projectVersion, None)
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self._getInstalceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
actorPathStr = \ actorPathStr = \
actorAbsolute + '/' + timelineStr + \ actorAbsolute + '/' + timelineStr + \
'?page=' + str(pageNumber) + timelineBookmark '?page=' + str(pageNumber) + timelineBookmark
@ -7769,7 +7795,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.postToNickname: if not self.postToNickname:
print('WARN: unable to find nickname in ' + actor) print('WARN: unable to find nickname in ' + actor)
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self._getInstalceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
actorPathStr = \ actorPathStr = \
actorAbsolute + '/' + timelineStr + \ actorAbsolute + '/' + timelineStr + \
'?page=' + str(pageNumber) '?page=' + str(pageNumber)
@ -7855,7 +7881,7 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
print('WARN: Unbookmarked post not found: ' + bookmarkFilename) print('WARN: Unbookmarked post not found: ' + bookmarkFilename)
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self._getInstalceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
actorPathStr = \ actorPathStr = \
actorAbsolute + '/' + timelineStr + \ actorAbsolute + '/' + timelineStr + \
'?page=' + str(pageNumber) + timelineBookmark '?page=' + str(pageNumber) + timelineBookmark
@ -8646,7 +8672,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.GETbusy = False self.server.GETbusy = False
return True return True
actor = path.replace('/skills', '') actor = path.replace('/skills', '')
actorAbsolute = self._getInstalceUrl(callingDomain) + actor actorAbsolute = self._getInstanceUrl(callingDomain) + actor
self._redirect_headers(actorAbsolute, cookie, callingDomain) self._redirect_headers(actorAbsolute, cookie, callingDomain)
self.server.GETbusy = False self.server.GETbusy = False
return True return True