Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
This commit is contained in:
commit
f60250bb21
|
@ -80,9 +80,7 @@ class JSONRequestHandler(BaseHTTPRequestHandler):
|
|||
sc = socket.socket()
|
||||
sc.settimeout(5)
|
||||
sc.connect((host, int(port)))
|
||||
with sc_lock: # 再次加锁,更新 sc_all
|
||||
sc_all[addr] = sc
|
||||
|
||||
sc.settimeout(0.5)
|
||||
while True:
|
||||
try:
|
||||
|
@ -110,10 +108,8 @@ class JSONRequestHandler(BaseHTTPRequestHandler):
|
|||
sc.close()
|
||||
except Exception:
|
||||
pass
|
||||
with sc_lock: # 加锁,清除无效连接
|
||||
sc_all[addr] = None
|
||||
self.error(f'采集器通信失败: {e}')
|
||||
print(traceback.format_exc())
|
||||
return None, None
|
||||
|
||||
sc, resp = connect_and_send()
|
||||
|
|
Loading…
Reference in New Issue