From d1614204714ac52757d70a24ddb1787bd871990e Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 20 May 2021 13:52:13 +0100 Subject: [PATCH] RSS failures are warnings --- newswire.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) 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