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

Standardize exception message prefix

merge-requests/30/head
Bob Mottram 2022-02-03 10:34:34 +00:00
parent 920fe5e2bf
commit bae77c61a0
1 changed files with 102 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
daemon.py
View File

@ -1025,10 +1025,10 @@ class PubServer(BaseHTTPRequestHandler):
return True return True
except BrokenPipeError as ex: except BrokenPipeError as ex:
if self.server.debug: if self.server.debug:
print('ERROR: _write error ' + str(tries) + ' ' + str(ex)) print('EX: _write error ' + str(tries) + ' ' + str(ex))
break break
except Exception as ex: except BaseException as ex:
print('ERROR: _write error ' + str(tries) + ' ' + str(ex)) print('EX: _write error ' + str(tries) + ' ' + str(ex))
time.sleep(0.5) time.sleep(0.5)
tries += 1 tries += 1
return False return False
@ -1732,16 +1732,16 @@ class PubServer(BaseHTTPRequestHandler):
login_params = self.rfile.read(length).decode('utf-8') login_params = self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST login read ' + print('EX: POST login read ' +
'connection reset by peer') 'connection reset by peer')
else: else:
print('WARN: POST login read socket error') print('EX: POST login read socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST login read failed, ' + str(ex)) print('EX: POST login read failed, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
@ -1925,16 +1925,16 @@ class PubServer(BaseHTTPRequestHandler):
moderation_params = self.rfile.read(length).decode('utf-8') moderation_params = self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST moderation_params connection was reset') print('EX: POST moderation_params connection was reset')
else: else:
print('WARN: POST moderation_params ' + print('EX: POST moderation_params ' +
'rfile.read socket error') 'rfile.read socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST moderation_params rfile.read failed, ' + print('EX: POST moderation_params rfile.read failed, ' +
str(ex)) str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
@ -2140,16 +2140,16 @@ class PubServer(BaseHTTPRequestHandler):
access_keys_params = self.rfile.read(length).decode('utf-8') access_keys_params = self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST access_keys_params ' + print('EX: POST access_keys_params ' +
'connection reset by peer') 'connection reset by peer')
else: else:
print('WARN: POST access_keys_params socket error') print('EX: POST access_keys_params socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST access_keys_params rfile.read failed, ' + print('EX: POST access_keys_params rfile.read failed, ' +
str(ex)) str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
@ -2233,16 +2233,16 @@ class PubServer(BaseHTTPRequestHandler):
theme_params = self.rfile.read(length).decode('utf-8') theme_params = self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST theme_params ' + print('EX: POST theme_params ' +
'connection reset by peer') 'connection reset by peer')
else: else:
print('WARN: POST theme_params socket error') print('EX: POST theme_params socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST theme_params rfile.read failed, ' + str(ex)) print('EX: POST theme_params rfile.read failed, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
@ -2383,16 +2383,16 @@ class PubServer(BaseHTTPRequestHandler):
options_confirm_params = self.rfile.read(length).decode('utf-8') options_confirm_params = self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST options_confirm_params ' + print('EX: POST options_confirm_params ' +
'connection reset by peer') 'connection reset by peer')
else: else:
print('WARN: POST options_confirm_params socket error') print('EX: POST options_confirm_params socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: ' + print('EX: ' +
'POST options_confirm_params rfile.read failed, ' + str(ex)) 'POST options_confirm_params rfile.read failed, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
@ -2996,16 +2996,16 @@ class PubServer(BaseHTTPRequestHandler):
follow_confirm_params = self.rfile.read(length).decode('utf-8') follow_confirm_params = self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST follow_confirm_params ' + print('EX: POST follow_confirm_params ' +
'connection was reset') 'connection was reset')
else: else:
print('WARN: POST follow_confirm_params socket error') print('EX: POST follow_confirm_params socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST follow_confirm_params rfile.read failed, ' + print('EX: POST follow_confirm_params rfile.read failed, ' +
str(ex)) str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
@ -3085,16 +3085,16 @@ class PubServer(BaseHTTPRequestHandler):
follow_confirm_params = self.rfile.read(length).decode('utf-8') follow_confirm_params = self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST follow_confirm_params ' + print('EX: POST follow_confirm_params ' +
'connection was reset') 'connection was reset')
else: else:
print('WARN: POST follow_confirm_params socket error') print('EX: POST follow_confirm_params socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST follow_confirm_params rfile.read failed, ' + print('EX: POST follow_confirm_params rfile.read failed, ' +
str(ex)) str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
@ -3185,16 +3185,16 @@ class PubServer(BaseHTTPRequestHandler):
block_confirm_params = self.rfile.read(length).decode('utf-8') block_confirm_params = self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST block_confirm_params ' + print('EX: POST block_confirm_params ' +
'connection was reset') 'connection was reset')
else: else:
print('WARN: POST block_confirm_params socket error') print('EX: POST block_confirm_params socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST block_confirm_params rfile.read failed, ' + print('EX: POST block_confirm_params rfile.read failed, ' +
str(ex)) str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
@ -3273,16 +3273,16 @@ class PubServer(BaseHTTPRequestHandler):
block_confirm_params = self.rfile.read(length).decode('utf-8') block_confirm_params = self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST block_confirm_params ' + print('EX: POST block_confirm_params ' +
'connection was reset') 'connection was reset')
else: else:
print('WARN: POST block_confirm_params socket error') print('EX: POST block_confirm_params socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST block_confirm_params rfile.read failed, ' + print('EX: POST block_confirm_params rfile.read failed, ' +
str(ex)) str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
@ -3357,15 +3357,15 @@ class PubServer(BaseHTTPRequestHandler):
search_params = self.rfile.read(length).decode('utf-8') search_params = self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST search_params connection was reset') print('EX: POST search_params connection was reset')
else: else:
print('WARN: POST search_params socket error') print('EX: POST search_params socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST search_params rfile.read failed, ' + str(ex)) print('EX: POST search_params rfile.read failed, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
@ -3816,15 +3816,15 @@ class PubServer(BaseHTTPRequestHandler):
question_params = self.rfile.read(length).decode('utf-8') question_params = self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST question_params connection was reset') print('EX: POST question_params connection was reset')
else: else:
print('WARN: POST question_params socket error') print('EX: POST question_params socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST question_params rfile.read failed, ' + str(ex)) print('EX: POST question_params rfile.read failed, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
@ -3894,16 +3894,16 @@ class PubServer(BaseHTTPRequestHandler):
media_bytes = self.rfile.read(length) media_bytes = self.rfile.read(length)
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST media_bytes ' + print('EX: POST media_bytes ' +
'connection reset by peer') 'connection reset by peer')
else: else:
print('WARN: POST media_bytes socket error') print('EX: POST media_bytes socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST media_bytes rfile.read failed, ' + str(ex)) print('EX: POST media_bytes rfile.read failed, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
@ -3942,16 +3942,16 @@ class PubServer(BaseHTTPRequestHandler):
self.rfile.read(length).decode('utf-8') self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST remove_share_confirm_params ' + print('EX: POST remove_share_confirm_params ' +
'connection was reset') 'connection was reset')
else: else:
print('WARN: POST remove_share_confirm_params socket error') print('EX: POST remove_share_confirm_params socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST remove_share_confirm_params ' + print('EX: POST remove_share_confirm_params ' +
'rfile.read failed, ' + str(ex)) 'rfile.read failed, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
@ -4010,16 +4010,16 @@ class PubServer(BaseHTTPRequestHandler):
self.rfile.read(length).decode('utf-8') self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST remove_share_confirm_params ' + print('EX: POST remove_share_confirm_params ' +
'connection was reset') 'connection was reset')
else: else:
print('WARN: POST remove_share_confirm_params socket error') print('EX: POST remove_share_confirm_params socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST remove_share_confirm_params ' + print('EX: POST remove_share_confirm_params ' +
'rfile.read failed, ' + str(ex)) 'rfile.read failed, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
@ -4081,16 +4081,16 @@ class PubServer(BaseHTTPRequestHandler):
self.rfile.read(length).decode('utf-8') self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST remove_post_confirm_params ' + print('EX: POST remove_post_confirm_params ' +
'connection was reset') 'connection was reset')
else: else:
print('WARN: POST remove_post_confirm_params socket error') print('EX: POST remove_post_confirm_params socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST remove_post_confirm_params ' + print('EX: POST remove_post_confirm_params ' +
'rfile.read failed, ' + str(ex)) 'rfile.read failed, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
@ -4206,17 +4206,17 @@ class PubServer(BaseHTTPRequestHandler):
post_bytes = self.rfile.read(length) post_bytes = self.rfile.read(length)
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: connection was reset while ' + print('EX: connection was reset while ' +
'reading bytes from http form POST') 'reading bytes from http form POST')
else: else:
print('WARN: error while reading bytes ' + print('EX: error while reading bytes ' +
'from http form POST') 'from http form POST')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: failed to read bytes for POST, ' + str(ex)) print('EX: failed to read bytes for POST, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
@ -4367,17 +4367,17 @@ class PubServer(BaseHTTPRequestHandler):
post_bytes = self.rfile.read(length) post_bytes = self.rfile.read(length)
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: connection was reset while ' + print('EX: connection was reset while ' +
'reading bytes from http form POST') 'reading bytes from http form POST')
else: else:
print('WARN: error while reading bytes ' + print('EX: error while reading bytes ' +
'from http form POST') 'from http form POST')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: failed to read bytes for POST, ' + str(ex)) print('EX: failed to read bytes for POST, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
@ -4451,17 +4451,17 @@ class PubServer(BaseHTTPRequestHandler):
post_bytes = self.rfile.read(length) post_bytes = self.rfile.read(length)
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: connection was reset while ' + print('EX: connection was reset while ' +
'reading bytes from http form POST') 'reading bytes from http form POST')
else: else:
print('WARN: error while reading bytes ' + print('EX: error while reading bytes ' +
'from http form POST') 'from http form POST')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: failed to read bytes for POST, ' + str(ex)) print('EX: failed to read bytes for POST, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
@ -4606,18 +4606,18 @@ class PubServer(BaseHTTPRequestHandler):
post_bytes = self.rfile.read(length) post_bytes = self.rfile.read(length)
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: connection was reset while ' + print('EX: connection was reset while ' +
'reading bytes from http form ' + 'reading bytes from http form ' +
'citation screen POST') 'citation screen POST')
else: else:
print('WARN: error while reading bytes ' + print('EX: error while reading bytes ' +
'from http form citations screen POST') 'from http form citations screen POST')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: failed to read bytes for ' + print('EX: failed to read bytes for ' +
'citations screen POST, ' + str(ex)) 'citations screen POST, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
@ -4706,17 +4706,17 @@ class PubServer(BaseHTTPRequestHandler):
post_bytes = self.rfile.read(length) post_bytes = self.rfile.read(length)
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: connection was reset while ' + print('EX: connection was reset while ' +
'reading bytes from http form POST') 'reading bytes from http form POST')
else: else:
print('WARN: error while reading bytes ' + print('EX: error while reading bytes ' +
'from http form POST') 'from http form POST')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: failed to read bytes for POST, ' + str(ex)) print('EX: failed to read bytes for POST, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
@ -4766,8 +4766,8 @@ class PubServer(BaseHTTPRequestHandler):
try: try:
save_json(self.server.newswire, save_json(self.server.newswire,
newswire_state_filename) newswire_state_filename)
except Exception as ex: except BaseException as ex:
print('ERROR: saving newswire state, ' + str(ex)) print('EX: saving newswire state, ' + str(ex))
# remove any previous cached news posts # remove any previous cached news posts
news_id = \ news_id = \
@ -4831,17 +4831,17 @@ class PubServer(BaseHTTPRequestHandler):
post_bytes = self.rfile.read(length) post_bytes = self.rfile.read(length)
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: connection was reset while ' + print('EX: connection was reset while ' +
'reading bytes from http form POST') 'reading bytes from http form POST')
else: else:
print('WARN: error while reading bytes ' + print('EX: error while reading bytes ' +
'from http form POST') 'from http form POST')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: failed to read bytes for POST, ' + str(ex)) print('EX: failed to read bytes for POST, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
@ -8113,8 +8113,8 @@ class PubServer(BaseHTTPRequestHandler):
base_dir + '/accounts/.newswirestate.json' base_dir + '/accounts/.newswirestate.json'
try: try:
save_json(newswire, newswire_state_filename) save_json(newswire, newswire_state_filename)
except Exception as ex: except BaseException as ex:
print('ERROR: saving newswire state, ' + str(ex)) print('EX: saving newswire state, ' + str(ex))
if filename: if filename:
save_json(newswire_item[votes_index], save_json(newswire_item[votes_index],
filename + '.votes') filename + '.votes')
@ -8168,8 +8168,8 @@ class PubServer(BaseHTTPRequestHandler):
base_dir + '/accounts/.newswirestate.json' base_dir + '/accounts/.newswirestate.json'
try: try:
save_json(newswire, newswire_state_filename) save_json(newswire, newswire_state_filename)
except Exception as ex: except BaseException as ex:
print('ERROR: saving newswire state, ' + str(ex)) print('EX: saving newswire state, ' + str(ex))
if filename: if filename:
save_json(newswire_item[votes_index], save_json(newswire_item[votes_index],
filename + '.votes') filename + '.votes')
@ -12702,8 +12702,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.css_cache) self.server.css_cache)
if css: if css:
break break
except Exception as ex: except BaseException as ex:
print('ERROR: _get_style_sheet ' + print('EX: _get_style_sheet ' +
str(tries) + ' ' + str(ex)) str(tries) + ' ' + str(ex))
time.sleep(1) time.sleep(1)
tries += 1 tries += 1
@ -12742,8 +12742,8 @@ class PubServer(BaseHTTPRequestHandler):
with open(qr_filename, 'rb') as av_file: with open(qr_filename, 'rb') as av_file:
media_binary = av_file.read() media_binary = av_file.read()
break break
except Exception as ex: except BaseException as ex:
print('ERROR: _show_q_rcode ' + str(tries) + ' ' + str(ex)) print('EX: _show_q_rcode ' + str(tries) + ' ' + str(ex))
time.sleep(1) time.sleep(1)
tries += 1 tries += 1
if media_binary: if media_binary:
@ -12786,8 +12786,8 @@ class PubServer(BaseHTTPRequestHandler):
with open(banner_filename, 'rb') as av_file: with open(banner_filename, 'rb') as av_file:
media_binary = av_file.read() media_binary = av_file.read()
break break
except Exception as ex: except BaseException as ex:
print('ERROR: _search_screen_banner ' + print('EX: _search_screen_banner ' +
str(tries) + ' ' + str(ex)) str(tries) + ' ' + str(ex))
time.sleep(1) time.sleep(1)
tries += 1 tries += 1
@ -12831,8 +12831,8 @@ class PubServer(BaseHTTPRequestHandler):
with open(banner_filename, 'rb') as av_file: with open(banner_filename, 'rb') as av_file:
media_binary = av_file.read() media_binary = av_file.read()
break break
except Exception as ex: except BaseException as ex:
print('ERROR: _column_image ' + str(tries) + ' ' + str(ex)) print('EX: _column_image ' + str(tries) + ' ' + str(ex))
time.sleep(1) time.sleep(1)
tries += 1 tries += 1
if media_binary: if media_binary:
@ -12875,8 +12875,8 @@ class PubServer(BaseHTTPRequestHandler):
with open(bg_filename, 'rb') as av_file: with open(bg_filename, 'rb') as av_file:
bg_binary = av_file.read() bg_binary = av_file.read()
break break
except Exception as ex: except BaseException as ex:
print('ERROR: _show_background_image ' + print('EX: _show_background_image ' +
str(tries) + ' ' + str(ex)) str(tries) + ' ' + str(ex))
time.sleep(1) time.sleep(1)
tries += 1 tries += 1
@ -12921,8 +12921,8 @@ class PubServer(BaseHTTPRequestHandler):
with open(bg_filename, 'rb') as av_file: with open(bg_filename, 'rb') as av_file:
bg_binary = av_file.read() bg_binary = av_file.read()
break break
except Exception as ex: except BaseException as ex:
print('ERROR: _show_default_profile_background ' + print('EX: _show_default_profile_background ' +
str(tries) + ' ' + str(ex)) str(tries) + ' ' + str(ex))
time.sleep(1) time.sleep(1)
tries += 1 tries += 1
@ -14855,8 +14855,8 @@ class PubServer(BaseHTTPRequestHandler):
with open(media_filename, 'rb') as av_file: with open(media_filename, 'rb') as av_file:
media_binary = av_file.read() media_binary = av_file.read()
break break
except Exception as ex: except BaseException as ex:
print('ERROR: manifest logo ' + print('EX: manifest logo ' +
str(tries) + ' ' + str(ex)) str(tries) + ' ' + str(ex))
time.sleep(1) time.sleep(1)
tries += 1 tries += 1
@ -14897,8 +14897,8 @@ class PubServer(BaseHTTPRequestHandler):
with open(screen_filename, 'rb') as av_file: with open(screen_filename, 'rb') as av_file:
media_binary = av_file.read() media_binary = av_file.read()
break break
except Exception as ex: except BaseException as ex:
print('ERROR: manifest screenshot ' + print('EX: manifest screenshot ' +
str(tries) + ' ' + str(ex)) str(tries) + ' ' + str(ex))
time.sleep(1) time.sleep(1)
tries += 1 tries += 1
@ -14939,8 +14939,8 @@ class PubServer(BaseHTTPRequestHandler):
with open(icon_filename, 'rb') as av_file: with open(icon_filename, 'rb') as av_file:
media_binary = av_file.read() media_binary = av_file.read()
break break
except Exception as ex: except BaseException as ex:
print('ERROR: login screen image ' + print('EX: login screen image ' +
str(tries) + ' ' + str(ex)) str(tries) + ' ' + str(ex))
time.sleep(1) time.sleep(1)
tries += 1 tries += 1
@ -17603,7 +17603,7 @@ class PubServer(BaseHTTPRequestHandler):
print('WARN: POST post_bytes socket error') print('WARN: POST post_bytes socket error')
return None return None
except ValueError as ex: except ValueError as ex:
print('ERROR: POST post_bytes rfile.read failed, ' + print('EX: POST post_bytes rfile.read failed, ' +
str(ex)) str(ex))
return None return None
@ -17646,7 +17646,7 @@ class PubServer(BaseHTTPRequestHandler):
print('WARN: handle POST message_bytes socket error') print('WARN: handle POST message_bytes socket error')
return {} return {}
except ValueError as ex: except ValueError as ex:
print('ERROR: handle POST message_bytes rfile.read failed ' + print('EX: handle POST message_bytes rfile.read failed ' +
str(ex)) str(ex))
return {} return {}
@ -17689,7 +17689,7 @@ class PubServer(BaseHTTPRequestHandler):
print('WARN: POST message_bytes socket error') print('WARN: POST message_bytes socket error')
return {} return {}
except ValueError as ex: except ValueError as ex:
print('ERROR: POST message_bytes rfile.read failed, ' + str(ex)) print('EX: POST message_bytes rfile.read failed, ' + str(ex))
return {} return {}
len_message = len(message_bytes) len_message = len(message_bytes)
@ -18469,16 +18469,16 @@ class PubServer(BaseHTTPRequestHandler):
unknown_post = self.rfile.read(length).decode('utf-8') unknown_post = self.rfile.read(length).decode('utf-8')
except SocketError as ex: except SocketError as ex:
if ex.errno == errno.ECONNRESET: if ex.errno == errno.ECONNRESET:
print('WARN: POST unknown_post ' + print('EX: POST unknown_post ' +
'connection reset by peer') 'connection reset by peer')
else: else:
print('WARN: POST unknown_post socket error') print('EX: POST unknown_post socket error')
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST unknown_post rfile.read failed, ' + print('EX: POST unknown_post rfile.read failed, ' +
str(ex)) str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
@ -18525,7 +18525,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.postreq_busy = False self.server.postreq_busy = False
return return
except ValueError as ex: except ValueError as ex:
print('ERROR: POST message_bytes rfile.read failed, ' + str(ex)) print('EX: POST message_bytes rfile.read failed, ' + str(ex))
self.send_response(400) self.send_response(400)
self.end_headers() self.end_headers()
self.server.postreq_busy = False self.server.postreq_busy = False
@ -18755,7 +18755,7 @@ def load_tokens(base_dir: str, tokens_dict: {}, tokens_lookup: {}) -> None:
try: try:
with open(token_filename, 'r') as fp_tok: with open(token_filename, 'r') as fp_tok:
token = fp_tok.read() token = fp_tok.read()
except Exception as ex: except BaseException as ex:
print('WARN: Unable to read token for ' + print('WARN: Unable to read token for ' +
nickname + ' ' + str(ex)) nickname + ' ' + str(ex))
if not token: if not token:
@ -18842,13 +18842,13 @@ def run_daemon(dyslexic_font: bool,
try: try:
httpd = EpicyonServer(server_address, pub_handler) httpd = EpicyonServer(server_address, pub_handler)
except Exception as ex: except SocketError as ex:
if ex.errno == 98: if ex.errno == errno.ECONNREFUSED:
print('ERROR: HTTP server address is already in use. ' + print('EX: HTTP server address is already in use. ' +
str(server_address)) str(server_address))
return False return False
print('ERROR: HTTP server failed to start. ' + str(ex)) print('EX: HTTP server failed to start. ' + str(ex))
print('server_address: ' + str(server_address)) print('server_address: ' + str(server_address))
return False return False