dm1sh/tgvkbot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

timeout fixes

Browse Source
This commit is contained in:
Kylmakalle 2017-07-08 01:24:53 +03:00
parent fa57f787b0
commit 87af6c9b8d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vk_messages.py
View File

@ -4,6 +4,7 @@ import redis
import requests import requests
import time import time
import vk import vk
import ujson
import wget import wget
logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.WARNING, filename='vk.log') logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s', level=logging.WARNING, filename='vk.log')
@ -20,13 +21,13 @@ class VkPolling:
def run(self, vk_user, bot, chat_id): def run(self, vk_user, bot, chat_id):
while self._running: while self._running:
timeout = 50 timeout = 30
try: try:
updates = vk_user.get_new_messages() updates = vk_user.get_new_messages()
if updates: if updates:
handle_updates(vk_user, bot, chat_id, updates) handle_updates(vk_user, bot, chat_id, updates)
except requests.exceptions.ReadTimeout: except requests.exceptions.ReadTimeout as e:
timeout *= 2 print('Error', e)
print('Retrying VK Polling in {} seconds.'.format(int(timeout / 10))) print('Retrying VK Polling in {} seconds.'.format(int(timeout / 10)))
for i in range(timeout): for i in range(timeout):
if self._running: if self._running:
@ -301,13 +302,15 @@ class VkMessage:
api = vk.API(self.session) api = vk.API(self.session)
try: try:
new = api.messages.getLongPollHistory(ts=self.ts, pts=self.pts) ts_pts = ujson.dumps({"ts": self.ts, "pts": self.pts})
new = api.execute(code='return API.messages.getLongPollHistory({});'.format(ts_pts)) # api.messages.getLongPollHistory(ts=self.ts, pts=self.pts)
except vk.api.VkAPIError: except vk.api.VkAPIError:
timeout = 3 timeout = 3
print('Retrying getLongPollHistory in {} seconds'.format(timeout)) print('Retrying getLongPollHistory in {} seconds'.format(timeout))
time.sleep(timeout) time.sleep(timeout)
self.ts, self.pts = get_tses(self.session) self.ts, self.pts = get_tses(self.session)
new = api.messages.getLongPollHistory(ts=self.ts, pts=self.pts) ts_pts = ujson.dumps({"ts": self.ts, "pts": self.pts})
new = api.execute(code='return API.messages.getLongPollHistory({});'.format(ts_pts))
msgs = new['messages'] msgs = new['messages']
self.pts = new["new_pts"] self.pts = new["new_pts"]