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

benchmark before redirect

merge-requests/30/head
Bob Mottram 2019-11-15 19:44:20 +00:00
parent 2fb834deb9
commit e7e35131f8
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
daemon.py
View File

@ -1715,15 +1715,15 @@ class PubServer(BaseHTTPRequestHandler):
if actor not in deleteUrl: if actor not in deleteUrl:
# You can only delete your own posts # You can only delete your own posts
self.server.GETbusy=False self.server.GETbusy=False
self._redirect_headers(actor+'/inbox',cookie)
self._benchmarkGET(GETstartTime) self._benchmarkGET(GETstartTime)
self._redirect_headers(actor+'/inbox',cookie)
return return
self.postToNickname=getNicknameFromActor(actor) self.postToNickname=getNicknameFromActor(actor)
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
self._redirect_headers(actor+'/inbox',cookie)
self._benchmarkGET(GETstartTime) self._benchmarkGET(GETstartTime)
self._redirect_headers(actor+'/inbox',cookie)
return return
if not self.server.session: if not self.server.session:
self.server.session= \ self.server.session= \
@ -3217,6 +3217,7 @@ class PubServer(BaseHTTPRequestHandler):
POSTstartTime=time.time() POSTstartTime=time.time()
if not self.server.session: if not self.server.session:
print('Starting new session from POST')
self.server.session= \ self.server.session= \
createSession(self.server.useTor) createSession(self.server.useTor)
@ -3802,10 +3803,10 @@ class PubServer(BaseHTTPRequestHandler):
self.server.domainFull+self.path.replace('/question','') self.server.domainFull+self.path.replace('/question','')
nickname=getNicknameFromActor(actor) nickname=getNicknameFromActor(actor)
if not nickname: if not nickname:
self._benchmarkPOST(POSTstartTime)
self._redirect_headers(actor+'/inbox?page='+ \ self._redirect_headers(actor+'/inbox?page='+ \
str(pageNumber),cookie) str(pageNumber),cookie)
self.server.POSTbusy=False self.server.POSTbusy=False
self._benchmarkPOST(POSTstartTime)
return return
# get the parameters # get the parameters
length = int(self.headers['Content-length']) length = int(self.headers['Content-length'])
@ -3977,9 +3978,9 @@ class PubServer(BaseHTTPRequestHandler):
self.server.POSTbusy=False self.server.POSTbusy=False
self._benchmarkPOST(POSTstartTime) self._benchmarkPOST(POSTstartTime)
return return
self._benchmarkPOST(POSTstartTime)
self._redirect_headers(actorStr+'/inbox',cookie) self._redirect_headers(actorStr+'/inbox',cookie)
self.server.POSTbusy=False self.server.POSTbusy=False
self._benchmarkPOST(POSTstartTime)
return return
# removes a shared item # removes a shared item
@ -4373,9 +4374,11 @@ class PubServer(BaseHTTPRequestHandler):
if '/users/' in thisActor: if '/users/' in thisActor:
nickname=thisActor.split('/users/')[1] nickname=thisActor.split('/users/')[1]
personSnooze(self.server.baseDir,nickname,self.server.domain,optionsActor) personSnooze(self.server.baseDir,nickname,self.server.domain,optionsActor)
self._benchmarkPOST(POSTstartTime)
self._redirect_headers(thisActor+ \ self._redirect_headers(thisActor+ \
'/inbox?page='+str(pageNumber),cookie) '/inbox?page='+str(pageNumber),cookie)
self.server.POSTbusy=False self.server.POSTbusy=False
return
if '&submitUnSnooze=' in optionsConfirmParams: if '&submitUnSnooze=' in optionsConfirmParams:
thisActor=self.path.split('/personoptions')[0] thisActor=self.path.split('/personoptions')[0]
if self.server.debug: if self.server.debug:
@ -4383,9 +4386,11 @@ class PubServer(BaseHTTPRequestHandler):
if '/users/' in thisActor: if '/users/' in thisActor:
nickname=thisActor.split('/users/')[1] nickname=thisActor.split('/users/')[1]
personUnsnooze(self.server.baseDir,nickname,self.server.domain,optionsActor) personUnsnooze(self.server.baseDir,nickname,self.server.domain,optionsActor)
self._benchmarkPOST(POSTstartTime)
self._redirect_headers(thisActor+ \ self._redirect_headers(thisActor+ \
'/inbox?page='+str(pageNumber),cookie) '/inbox?page='+str(pageNumber),cookie)
self.server.POSTbusy=False self.server.POSTbusy=False
return
if '&submitReport=' in optionsConfirmParams: if '&submitReport=' in optionsConfirmParams:
if self.server.debug: if self.server.debug:
print('Reporting '+optionsActor) print('Reporting '+optionsActor)
@ -4400,9 +4405,9 @@ class PubServer(BaseHTTPRequestHandler):
self._benchmarkPOST(POSTstartTime) self._benchmarkPOST(POSTstartTime)
return return
self._benchmarkPOST(POSTstartTime)
self._redirect_headers(originPathStr,cookie) self._redirect_headers(originPathStr,cookie)
self.server.POSTbusy=False self.server.POSTbusy=False
self._benchmarkPOST(POSTstartTime)
return return
pageNumber=self._receiveNewPost(authorized,'newpost',self.path) pageNumber=self._receiveNewPost(authorized,'newpost',self.path)
@ -4410,60 +4415,60 @@ class PubServer(BaseHTTPRequestHandler):
nickname=self.path.split('/users/')[1] nickname=self.path.split('/users/')[1]
if '/' in nickname: if '/' in nickname:
nickname=nickname.split('/')[0] nickname=nickname.split('/')[0]
self._benchmarkPOST(POSTstartTime)
self._redirect_headers('/users/'+nickname+ \ self._redirect_headers('/users/'+nickname+ \
'/inbox?page='+str(pageNumber),cookie) '/inbox?page='+str(pageNumber),cookie)
self.server.POSTbusy=False self.server.POSTbusy=False
self._benchmarkPOST(POSTstartTime)
return return
pageNumber=self._receiveNewPost(authorized,'newunlisted',self.path) pageNumber=self._receiveNewPost(authorized,'newunlisted',self.path)
if pageNumber: if pageNumber:
nickname=self.path.split('/users/')[1] nickname=self.path.split('/users/')[1]
if '/' in nickname: if '/' in nickname:
nickname=nickname.split('/')[0] nickname=nickname.split('/')[0]
self._benchmarkPOST(POSTstartTime)
self._redirect_headers('/users/'+nickname+ \ self._redirect_headers('/users/'+nickname+ \
'/inbox?page='+str(pageNumber),cookie) '/inbox?page='+str(pageNumber),cookie)
self.server.POSTbusy=False self.server.POSTbusy=False
self._benchmarkPOST(POSTstartTime)
return return
pageNumber=self._receiveNewPost(authorized,'newfollowers',self.path) pageNumber=self._receiveNewPost(authorized,'newfollowers',self.path)
if pageNumber: if pageNumber:
nickname=self.path.split('/users/')[1] nickname=self.path.split('/users/')[1]
if '/' in nickname: if '/' in nickname:
nickname=nickname.split('/')[0] nickname=nickname.split('/')[0]
self._benchmarkPOST(POSTstartTime)
self._redirect_headers('/users/'+nickname+ \ self._redirect_headers('/users/'+nickname+ \
'/inbox?page='+str(pageNumber),cookie) '/inbox?page='+str(pageNumber),cookie)
self.server.POSTbusy=False self.server.POSTbusy=False
self._benchmarkPOST(POSTstartTime)
return return
pageNumber=self._receiveNewPost(authorized,'newdm',self.path) pageNumber=self._receiveNewPost(authorized,'newdm',self.path)
if pageNumber: if pageNumber:
nickname=self.path.split('/users/')[1] nickname=self.path.split('/users/')[1]
if '/' in nickname: if '/' in nickname:
nickname=nickname.split('/')[0] nickname=nickname.split('/')[0]
self._benchmarkPOST(POSTstartTime)
self._redirect_headers('/users/'+nickname+ \ self._redirect_headers('/users/'+nickname+ \
'/inbox?page='+str(pageNumber),cookie) '/inbox?page='+str(pageNumber),cookie)
self.server.POSTbusy=False self.server.POSTbusy=False
self._benchmarkPOST(POSTstartTime)
return return
pageNumber=self._receiveNewPost(authorized,'newreport',self.path) pageNumber=self._receiveNewPost(authorized,'newreport',self.path)
if pageNumber: if pageNumber:
nickname=self.path.split('/users/')[1] nickname=self.path.split('/users/')[1]
if '/' in nickname: if '/' in nickname:
nickname=nickname.split('/')[0] nickname=nickname.split('/')[0]
self._benchmarkPOST(POSTstartTime)
self._redirect_headers('/users/'+nickname+ \ self._redirect_headers('/users/'+nickname+ \
'/inbox?page='+str(pageNumber),cookie) '/inbox?page='+str(pageNumber),cookie)
self.server.POSTbusy=False self.server.POSTbusy=False
self._benchmarkPOST(POSTstartTime)
return return
pageNumber=self._receiveNewPost(authorized,'newshare',self.path) pageNumber=self._receiveNewPost(authorized,'newshare',self.path)
if pageNumber: if pageNumber:
nickname=self.path.split('/users/')[1] nickname=self.path.split('/users/')[1]
if '/' in nickname: if '/' in nickname:
nickname=nickname.split('/')[0] nickname=nickname.split('/')[0]
self._benchmarkPOST(POSTstartTime)
self._redirect_headers('/users/'+nickname+ \ self._redirect_headers('/users/'+nickname+ \
'/shares?page='+str(pageNumber),cookie) '/shares?page='+str(pageNumber),cookie)
self.server.POSTbusy=False self.server.POSTbusy=False
self._benchmarkPOST(POSTstartTime)
return return
if self.path.endswith('/outbox') or self.path.endswith('/shares'): if self.path.endswith('/outbox') or self.path.endswith('/shares'):