From fabbc8184511a296849417590d8e321a92143a2f Mon Sep 17 00:00:00 2001 From: lifegpc Date: Wed, 5 May 2021 11:11:00 +0800 Subject: [PATCH] remove retry code in rsschecker --- rsschecker.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/rsschecker.py b/rsschecker.py index 0413b06..4f2d4b8 100644 --- a/rsschecker.py +++ b/rsschecker.py @@ -46,20 +46,14 @@ class RSSCheckerThread(Thread): for info in rss.chatList: chatEntry: ChatEntry = info try: - for i in range(self._main._setting._maxRetryCount + 1): - suc, text = self._main._sendMessage( - chatEntry.chatId, meta, item, chatEntry.config, True) - if suc: - break - sleep(5) - if i < self._main._setting._maxRetryCount: - print(f'开始第{i+i}次重试\n{text}') - else: - text2 = f'\n{rss.title}' - if 'link' in item: - text2 = f"{text2}\n{item['link']}" - self._main._request('sendMessage', 'post', { - 'chat_id': chatEntry.chatId, 'text': f'已尝试重发{i}次，发送失败。\n{text}{text2}'}) + suc, text = self._main._sendMessage( + chatEntry.chatId, meta, item, chatEntry.config, True) + if not suc: + text2 = f'\n{rss.title}' + if 'link' in item: + text2 = f"{text2}\n{item['link']}" + self._main._request('sendMessage', 'post', { + 'chat_id': chatEntry.chatId, 'text': f'发送失败。\n{text}{text2}'}) except: print(format_exc()) else: