star-inc/star_yuuki_bot
1
1
Fork 0
mirror of https://github.com/star-inc/star_yuuki_bot.git synced 2024-09-20 14:56:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Timeout

Browse source
This commit is contained in:
SuperSonic 2019-09-02 20:54:54 +08:00
parent 992eb83583
commit 7ccc256264
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/connection.py
View file

@ -41,10 +41,12 @@ class Yuuki_Connect:
self.helper_ids = []
self.helper_authTokens = {}
def connect(self):
def connect(self, listen_timeout=600000):
transport = THttpClient.THttpClient(self.host + self.com_path)
transport_in = THttpClient.THttpClient(self.host + self.poll_path)
transport_in.setTimeout(listen_timeout)
transport.setCustomHeaders(self.con_header)
transport_in.setCustomHeaders(self.con_header)

24
libs/yuuki.py
View file

@ -1,7 +1,8 @@
#!/usr/bin/python3
# coding=UTF-8
import os, time, \
import socket, \
os, time, \
json, ntpath, \
random, requests, \
platform, traceback
@ -18,7 +19,7 @@ class Yuuki_Settings:
config = {
"name": "Yuuki",
"version": "v6.5.1",
"version": "v6.5.1_RC1",
"project_url": "https://tinyurl.com/syb-yuuki",
"man_page": "https://tinyurl.com/yuuki-manual",
"privacy_page": "OpenSource - Licensed under MPL 2.0",
@ -671,9 +672,9 @@ class Yuuki:
def Main(self):
NoWork = 0
NoWorkLimit = 300
fetchNum = 50
NoWorkLimit = 5
fetchNum = 50
catchedNews = []
ncMessage = Operation()
@ -688,17 +689,22 @@ class Yuuki:
if time.localtime().tm_hour != self.data.getData("Global")["LastResetLimitTime"]:
self.limitReset()
self.data.updateData(self.data.getData("Global"), "LastResetLimitTime", time.localtime().tm_hour)
if NoWork >= NoWorkLimit:
self.revision = self.getClient(self.MyMID).getLastOpRevision()
catchedNews = self.listen.fetchOperations(self.revision, fetchNum)
if NoWork >= NoWorkLimit:
NoWork = 0
self.revision = self.client.getLastOpRevision()
try:
catchedNews = self.listen.fetchOperations(self.revision, fetchNum)
except socket.timeout:
print("Timeout")
NoWork += 1
if catchedNews:
NoWork = 0
self.Thread_Exec(self.taskDemux, (catchedNews,))
if len(catchedNews) > 1:
self.revision = max(catchedNews[-1].revision, catchedNews[-2].revision)
else:
NoWork += 1
if self.data.Data != self.YuukiVariable["sync"]:
self.data.Data = self.YuukiVariable["sync"]