From f26f268581d85b8c854c6b3ca0826a235c407cce Mon Sep 17 00:00:00 2001 From: chenjunxue <1523825571@qq.com> Date: Sat, 8 Aug 2020 16:48:14 +0800 Subject: [PATCH] 增加change线程锁 去除超时时间 --- conf/config.yaml | 4 ++-- core/monitor.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/config.yaml b/conf/config.yaml index 2fe03de..7b06731 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -4,5 +4,5 @@ SERVER: reconnect_interval: 3 VERSION: - code: 91 - name: 2.0.1 \ No newline at end of file + code: 92 + name: 2.0.2 \ No newline at end of file diff --git a/core/monitor.py b/core/monitor.py index 6efa030..af05f3b 100644 --- a/core/monitor.py +++ b/core/monitor.py @@ -86,8 +86,8 @@ class Monitor(callback.CallBack): return client.info() else: try: - self.onChangEnv(email, 'waiting', '排队中') - self.changeLock.acquire(timeout=120) # 设置超时释放时间为120秒 + self.onChangEnv(email, 'waiting', '队列中...') + self.changeLock.acquire() self.changeingIn(email) # 转环境的话清理缓存 result, email, password, cookie, user_agent = self.selenium_login(email, password, cookie) if result: -- libgit2 0.24.0