diff --git a/daemon.py b/daemon.py index 6cdc6a303..b939ab283 100644 --- a/daemon.py +++ b/daemon.py @@ -833,7 +833,7 @@ class PubServer(BaseHTTPRequestHandler): self.wfile.write(msg) return True except Exception as e: - print(e) + print('ERROR: _write error ' + str(tries) + ' ' + str(e)) time.sleep(0.5) tries += 1 return False @@ -1519,8 +1519,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST login read failed') - print(e) + print('ERROR: POST login read failed, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -1679,8 +1678,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST moderationParams rfile.read failed') - print(e) + print('ERROR: POST moderationParams rfile.read failed, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -1882,8 +1880,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST accessKeysParams rfile.read failed') - print(e) + print('ERROR: POST accessKeysParams rfile.read failed, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -1980,8 +1977,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST optionsConfirmParams rfile.read failed') - print(e) + print('ERROR: ' + + 'POST optionsConfirmParams rfile.read failed, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -2484,8 +2481,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST followConfirmParams rfile.read failed') - print(e) + print('ERROR: POST followConfirmParams rfile.read failed, ' + + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -2568,8 +2565,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST followConfirmParams rfile.read failed') - print(e) + print('ERROR: POST followConfirmParams rfile.read failed, ' + + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -2666,8 +2663,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST blockConfirmParams rfile.read failed') - print(e) + print('ERROR: POST blockConfirmParams rfile.read failed, ' + + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -2750,8 +2747,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST blockConfirmParams rfile.read failed') - print(e) + print('ERROR: POST blockConfirmParams rfile.read failed, ' + + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -2832,8 +2829,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST searchParams rfile.read failed') - print(e) + print('ERROR: POST searchParams rfile.read failed, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -3168,8 +3164,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST questionParams rfile.read failed') - print(e) + print('ERROR: POST questionParams rfile.read failed, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -3250,8 +3245,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST mediaBytes rfile.read failed') - print(e) + print('ERROR: POST mediaBytes rfile.read failed, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -3304,8 +3298,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST removeShareConfirmParams rfile.read failed') - print(e) + print('ERROR: POST removeShareConfirmParams rfile.read failed, ' + + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -3366,8 +3360,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST removePostConfirmParams rfile.read failed') - print(e) + print('ERROR: POST removePostConfirmParams rfile.read failed, ' + + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -3491,8 +3485,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: failed to read bytes for POST') - print(e) + print('ERROR: failed to read bytes for POST, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -3621,8 +3614,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: failed to read bytes for POST') - print(e) + print('ERROR: failed to read bytes for POST, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -3701,8 +3693,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: failed to read bytes for POST') - print(e) + print('ERROR: failed to read bytes for POST, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -3815,8 +3806,7 @@ class PubServer(BaseHTTPRequestHandler): return except ValueError as e: print('ERROR: failed to read bytes for ' + - 'citations screen POST') - print(e) + 'citations screen POST, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -3913,8 +3903,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: failed to read bytes for POST') - print(e) + print('ERROR: failed to read bytes for POST, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -3962,7 +3951,7 @@ class PubServer(BaseHTTPRequestHandler): saveJson(self.server.newswire, newswireStateFilename) except Exception as e: - print('ERROR saving newswire state, ' + str(e)) + print('ERROR: saving newswire state, ' + str(e)) # remove any previous cached news posts newsId = \ @@ -4033,8 +4022,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: failed to read bytes for POST') - print(e) + print('ERROR: failed to read bytes for POST, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -6520,7 +6508,7 @@ class PubServer(BaseHTTPRequestHandler): try: saveJson(newswire, newswireStateFilename) except Exception as e: - print('ERROR saving newswire state, ' + str(e)) + print('ERROR: saving newswire state, ' + str(e)) if filename: saveJson(newswireItem[votesIndex], filename + '.votes') @@ -6575,7 +6563,7 @@ class PubServer(BaseHTTPRequestHandler): try: saveJson(newswire, newswireStateFilename) except Exception as e: - print('ERROR saving newswire state, ' + str(e)) + print('ERROR: saving newswire state, ' + str(e)) if filename: saveJson(newswireItem[votesIndex], filename + '.votes') @@ -10000,7 +9988,7 @@ class PubServer(BaseHTTPRequestHandler): if css: break except Exception as e: - print(e) + print('ERROR: _getStyleSheet ' + str(tries) + ' ' + str(e)) time.sleep(1) tries += 1 msg = css.encode('utf-8') @@ -10038,7 +10026,7 @@ class PubServer(BaseHTTPRequestHandler): mediaBinary = avFile.read() break except Exception as e: - print(e) + print('ERROR: _showQRcode ' + str(tries) + ' ' + str(e)) time.sleep(1) tries += 1 if mediaBinary: @@ -10077,7 +10065,8 @@ class PubServer(BaseHTTPRequestHandler): mediaBinary = avFile.read() break except Exception as e: - print(e) + print('ERROR: _searchScreenBanner ' + + str(tries) + ' ' + str(e)) time.sleep(1) tries += 1 if mediaBinary: @@ -10119,7 +10108,7 @@ class PubServer(BaseHTTPRequestHandler): mediaBinary = avFile.read() break except Exception as e: - print(e) + print('ERROR: _columnImage ' + str(tries) + ' ' + str(e)) time.sleep(1) tries += 1 if mediaBinary: @@ -10162,7 +10151,8 @@ class PubServer(BaseHTTPRequestHandler): bgBinary = avFile.read() break except Exception as e: - print(e) + print('ERROR: _showBackgroundImage ' + + str(tries) + ' ' + str(e)) time.sleep(1) tries += 1 if bgBinary: @@ -11473,7 +11463,8 @@ class PubServer(BaseHTTPRequestHandler): mediaBinary = avFile.read() break except Exception as e: - print(e) + print('ERROR: manifest logo ' + + str(tries) + ' ' + str(e)) time.sleep(1) tries += 1 if mediaBinary: @@ -11513,7 +11504,8 @@ class PubServer(BaseHTTPRequestHandler): mediaBinary = avFile.read() break except Exception as e: - print(e) + print('ERROR: manifest screenshot ' + + str(tries) + ' ' + str(e)) time.sleep(1) tries += 1 if mediaBinary: @@ -11558,7 +11550,8 @@ class PubServer(BaseHTTPRequestHandler): mediaBinary = avFile.read() break except Exception as e: - print(e) + print('ERROR: login screen image ' + + str(tries) + ' ' + str(e)) time.sleep(1) tries += 1 if mediaBinary: @@ -13876,8 +13869,7 @@ class PubServer(BaseHTTPRequestHandler): print('WARN: POST postBytes socket error') return None except ValueError as e: - print('ERROR: POST postBytes rfile.read failed') - print(e) + print('ERROR: POST postBytes rfile.read failed, ' + str(e)) return None # second length check from the bytes received @@ -13918,8 +13910,8 @@ class PubServer(BaseHTTPRequestHandler): print('WARN: handle POST messageBytes socket error') return {} except ValueError as e: - print('ERROR: handle POST messageBytes rfile.read failed') - print(e) + print('ERROR: handle POST messageBytes rfile.read failed ' + + str(e)) return {} lenMessage = len(messageBytes) @@ -13961,8 +13953,7 @@ class PubServer(BaseHTTPRequestHandler): print('WARN: POST messageBytes socket error') return {} except ValueError as e: - print('ERROR: POST messageBytes rfile.read failed') - print(e) + print('ERROR: POST messageBytes rfile.read failed, ' + str(e)) return {} lenMessage = len(messageBytes) @@ -14580,8 +14571,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST unknownPost rfile.read failed') - print(e) + print('ERROR: POST unknownPost rfile.read failed, ' + + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -14625,8 +14616,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.POSTbusy = False return except ValueError as e: - print('ERROR: POST messageBytes rfile.read failed') - print(e) + print('ERROR: POST messageBytes rfile.read failed, ' + str(e)) self.send_response(400) self.end_headers() self.server.POSTbusy = False @@ -14769,7 +14759,8 @@ class EpicyonServer(ThreadingHTTPServer): # surpress connection reset errors cls, e = sys.exc_info()[:2] if cls is ConnectionResetError: - print('ERROR: ' + str(cls) + ", " + str(e)) + if e.errno != errno.ECONNRESET: + print('ERROR: (EpicyonServer) ' + str(cls) + ", " + str(e)) pass else: return HTTPServer.handle_error(self, request, client_address) diff --git a/newswire.py b/newswire.py index f59ca36cb..fdbc075f8 100644 --- a/newswire.py +++ b/newswire.py @@ -774,19 +774,18 @@ def getRSS(baseDir: str, domain: str, session, url: str, else: print('WARN: no result returned for feed ' + url) except requests.exceptions.RequestException as e: - print('ERROR: getRSS failed\nurl: ' + str(url) + '\n' + - 'headers: ' + str(sessionHeaders) + '\n' + - 'params: ' + str(sessionParams) + '\n') - print(e) + print('WARN: getRSS failed\nurl: ' + str(url) + ', ' + + 'headers: ' + str(sessionHeaders) + ', ' + + 'params: ' + str(sessionParams) + ', ' + str(e)) except ValueError as e: - print('ERROR: getRSS failed\nurl: ' + str(url) + '\n' + - 'headers: ' + str(sessionHeaders) + '\n' + - 'params: ' + str(sessionParams) + '\n') - print(e) + print('WARN: getRSS failed\nurl: ' + str(url) + ', ' + + 'headers: ' + str(sessionHeaders) + ', ' + + 'params: ' + str(sessionParams) + ', ' + str(e)) except SocketError as e: if e.errno == errno.ECONNRESET: - print('WARN: connection was reset during getRSS') - print(e) + print('WARN: connection was reset during getRSS ' + str(e)) + else: + print('WARN: getRSS, ' + str(e)) return None diff --git a/posts.py b/posts.py index 401e82037..1d4801d78 100644 --- a/posts.py +++ b/posts.py @@ -674,7 +674,7 @@ def deleteAllPosts(baseDir: str, elif os.path.isdir(filePath): shutil.rmtree(filePath) except Exception as e: - print(e) + print('ERROR: deleteAllPosts ' + str(e)) def savePostToBox(baseDir: str, httpPrefix: str, postId: str, diff --git a/session.py b/session.py index 16f7d0fe5..c2c02a128 100644 --- a/session.py +++ b/session.py @@ -21,19 +21,16 @@ def createSession(proxyType: str): try: session = requests.session() except requests.exceptions.RequestException as e: - print('WARN: requests error during createSession') - print(e) + print('WARN: requests error during createSession ' + str(e)) return None except SocketError as e: if e.errno == errno.ECONNRESET: - print('WARN: connection was reset during createSession') + print('WARN: connection was reset during createSession ' + str(e)) else: - print('WARN: socket error during createSession') - print(e) + print('WARN: socket error during createSession ' + str(e)) return None except ValueError as e: - print('WARN: error during createSession') - print(e) + print('WARN: error during createSession ' + str(e)) return None if not session: return None @@ -126,14 +123,12 @@ def getJson(session, url: str, headers: {}, params: {}, debug: bool, if debug and not quiet: print('ERROR: getJson failed\nurl: ' + str(url) + ' ' + 'headers: ' + str(sessionHeaders2) + ' ' + - 'params: ' + str(sessionParams) + ' ') - print(e) + 'params: ' + str(sessionParams) + ' ' + str(e)) except SocketError as e: if not quiet: if e.errno == errno.ECONNRESET: print('WARN: getJson failed, ' + - 'connection was reset during getJson') - print(e) + 'connection was reset during getJson ' + str(e)) return None @@ -161,8 +156,8 @@ def postJson(session, postJsonObject: {}, federationList: [], except requests.exceptions.RequestException as e: if not quiet: print('ERROR: postJson requests failed ' + inboxUrl + ' ' + - json.dumps(postJsonObject) + ' ' + str(headers)) - print(e) + json.dumps(postJsonObject) + ' ' + str(headers) + + ' ' + str(e)) return None except SocketError as e: if not quiet and e.errno == errno.ECONNRESET: @@ -171,8 +166,8 @@ def postJson(session, postJsonObject: {}, federationList: [], except ValueError as e: if not quiet: print('ERROR: postJson failed ' + inboxUrl + ' ' + - json.dumps(postJsonObject) + ' ' + str(headers)) - print(e) + json.dumps(postJsonObject) + ' ' + str(headers) + + ' ' + str(e)) return None if postResult: return postResult.text @@ -198,8 +193,7 @@ def postJsonString(session, postJsonStr: str, headers=headers, timeout=timeoutSec) except requests.exceptions.RequestException as e: if not quiet: - print('WARN: error during postJsonString requests') - print(e) + print('WARN: error during postJsonString requests ' + str(e)) return None, None except SocketError as e: if not quiet and e.errno == errno.ECONNRESET: @@ -210,8 +204,7 @@ def postJsonString(session, postJsonStr: str, return None, None except ValueError as e: if not quiet: - print('WARN: error during postJsonString') - print(e) + print('WARN: error during postJsonString ' + str(e)) return None, None if postResult.status_code < 200 or postResult.status_code > 202: if postResult.status_code >= 400 and \ @@ -265,19 +258,16 @@ def postImage(session, attachImageFilename: str, federationList: [], postResult = session.post(url=inboxUrl, data=mediaBinary, headers=headers) except requests.exceptions.RequestException as e: - print('WARN: error during postImage requests') - print(e) + print('WARN: error during postImage requests ' + str(e)) return None except SocketError as e: if e.errno == errno.ECONNRESET: print('WARN: connection was reset during postImage') print('ERROR: postImage failed ' + inboxUrl + ' ' + - str(headers)) - print(e) + str(headers) + ' ' + str(e)) return None except ValueError as e: - print('WARN: error during postImage') - print(e) + print('WARN: error during postImage ' + str(e)) return None if postResult: return postResult.text diff --git a/webapp_utils.py b/webapp_utils.py index 953f74837..62902026d 100644 --- a/webapp_utils.py +++ b/webapp_utils.py @@ -493,9 +493,8 @@ def updateAvatarImageCache(session, baseDir: str, httpPrefix: str, print('avatar image downloaded for ' + actor) return avatarImageFilename.replace(baseDir + '/cache', '') except Exception as e: - if debug: - print('Failed to download avatar image: ' + str(avatarUrl)) - print(e) + print('WARN: Failed to download avatar image: ' + + str(avatarUrl) + ' ' + str(e)) prof = 'https://www.w3.org/ns/activitystreams' if '/channel/' not in actor or '/accounts/' not in actor: sessionHeaders = { @@ -949,7 +948,8 @@ def loadIndividualPostAsHtmlFromCache(baseDir: str, postHtml = file.read() break except Exception as e: - print(e) + print('ERROR: loadIndividualPostAsHtmlFromCache ' + + str(tries) + ' ' + str(e)) # no sleep tries += 1 if postHtml: diff --git a/webfinger.py b/webfinger.py index 7ece61575..1f4bacdf2 100644 --- a/webfinger.py +++ b/webfinger.py @@ -78,7 +78,7 @@ def webfingerHandle(session, handle: str, httpPrefix: str, debug, projectVersion, httpPrefix, fromDomain) except Exception as e: - print(e) + print('ERROR: webfingerHandle ' + str(e)) return None if result: