mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clear busy status if session creation fails

main
Bob Mottram 2020-06-08 19:34:29 +01:00
parent 4fecd1fa3a
commit d780c3330f
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
daemon.py
View File

@ -2284,6 +2284,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to create session 7') print('ERROR: GET failed to create session 7')
self._404() self._404()
self.server.GETbusy = False
return return
self.server.actorRepeat = self.path.split('?actor=')[1] self.server.actorRepeat = self.path.split('?actor=')[1]
announceToStr = \ announceToStr = \
@ -2378,6 +2379,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to create session 8') print('ERROR: GET failed to create session 8')
self._404() self._404()
self.server.GETbusy = False
return return
undoAnnounceActor = \ undoAnnounceActor = \
self.server.httpPrefix + '://' + self.server.domainFull + \ self.server.httpPrefix + '://' + self.server.domainFull + \
@ -2427,6 +2429,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to create session 9') print('ERROR: GET failed to create session 9')
self._404() self._404()
self.server.GETbusy = False
return return
manualApproveFollowRequest(self.server.session, manualApproveFollowRequest(self.server.session,
self.server.baseDir, self.server.baseDir,
@ -2550,6 +2553,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to create session 10') print('ERROR: GET failed to create session 10')
self._404() self._404()
self.server.GETbusy = False
return return
likeActor = \ likeActor = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \
@ -2648,6 +2652,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to create session 11') print('ERROR: GET failed to create session 11')
self._404() self._404()
self.server.GETbusy = False
return return
undoActor = \ undoActor = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \
@ -2748,6 +2753,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to create session 12') print('ERROR: GET failed to create session 12')
self._404() self._404()
self.server.GETbusy = False
return return
bookmarkActor = \ bookmarkActor = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \
@ -2834,6 +2840,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to create session 13') print('ERROR: GET failed to create session 13')
self._404() self._404()
self.server.GETbusy = False
return return
undoActor = \ undoActor = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \
@ -2930,6 +2937,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to create session 14') print('ERROR: GET failed to create session 14')
self._404() self._404()
self.server.GETbusy = False
return return
deleteStr = \ deleteStr = \
@ -3364,6 +3372,7 @@ class PubServer(BaseHTTPRequestHandler):
print('ERROR: GET failed to ' + print('ERROR: GET failed to ' +
'create session 15') 'create session 15')
self._404() self._404()
self.server.GETbusy = False
return return
recentPostsCache = \ recentPostsCache = \
self.server.recentPostsCache self.server.recentPostsCache
@ -3463,6 +3472,7 @@ class PubServer(BaseHTTPRequestHandler):
print('ERROR: GET failed to ' + print('ERROR: GET failed to ' +
'create session 16') 'create session 16')
self._404() self._404()
self.server.GETbusy = False
return return
recentPostsCache = \ recentPostsCache = \
self.server.recentPostsCache self.server.recentPostsCache
@ -4541,6 +4551,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to create session 17') print('ERROR: GET failed to create session 17')
self._404() self._404()
self.server.GETbusy = False
return return
msg = \ msg = \
htmlProfile(self.server.defaultTimeline, htmlProfile(self.server.defaultTimeline,
@ -4619,6 +4630,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to create session 18') print('ERROR: GET failed to create session 18')
self._404() self._404()
self.server.GETbusy = False
return return
msg = \ msg = \
@ -4697,6 +4709,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to create session 19') print('ERROR: GET failed to create session 19')
self._404() self._404()
self.server.GETbusy = False
return return
msg = \ msg = \
htmlProfile(self.server.defaultTimeline, htmlProfile(self.server.defaultTimeline,
@ -4750,6 +4763,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('ERROR: GET failed to create session 20') print('ERROR: GET failed to create session 20')
self._404() self._404()
self.server.GETbusy = False
return return
msg = \ msg = \
htmlProfile(self.server.defaultTimeline, htmlProfile(self.server.defaultTimeline,
@ -5704,8 +5718,13 @@ class PubServer(BaseHTTPRequestHandler):
self.server.POSTbusy = False self.server.POSTbusy = False
return return
# read the bytes of the http form POST try:
postBytes = self.rfile.read(length) # read the bytes of the http form POST
postBytes = self.rfile.read(length)
except BaseException:
print('ERROR: failed to read bytes for POST')
self.server.POSTbusy = False
return
# extract each image type # extract each image type
actorChanged = True actorChanged = True
@ -6606,6 +6625,7 @@ class PubServer(BaseHTTPRequestHandler):
if not self.server.session: if not self.server.session:
print('ERROR: POST failed to create session 2') print('ERROR: POST failed to create session 2')
self._404() self._404()
self.server.POSTbusy = False
return return
profilePathStr = self.path.replace('/searchhandle', '') profilePathStr = self.path.replace('/searchhandle', '')
profileStr = \ profileStr = \