river_tao/OneForAll-mirror
1
0
Fork 0
mirror of https://github.com/shmilylty/OneForAll.git synced 2026-10-27 19:25:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化重试

Browse Source
This commit is contained in:
Jing Ling
2020-11-12 01:59:44 +08:00
parent 68d8987eea
commit 17d46ee153
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
brute.py
+1 -1
View File
@@ -271,7 +271,7 @@ def get_wildcard_record(domain, resolver):
except Timeout as e: except Timeout as e:
logger.log('ALERT', f'Query timeout, retrying') logger.log('ALERT', f'Query timeout, retrying')
logger.log('DEBUG', e.args) logger.log('DEBUG', e.args)
raise tenacity.TryAgain raise e
except (NXDOMAIN, YXDOMAIN, NoAnswer, NoNameservers) as e: except (NXDOMAIN, YXDOMAIN, NoAnswer, NoNameservers) as e:
logger.log('DEBUG', e.args) logger.log('DEBUG', e.args)
logger.log('DEBUG', f'{domain} dont have A record on authoritative name server') logger.log('DEBUG', f'{domain} dont have A record on authoritative name server')
common/utils.py
+6 -10
View File
@@ -500,7 +500,8 @@ def delete_file(*paths):
logger.log('ERROR', e.args) logger.log('ERROR', e.args)
@tenacity.retry(stop=tenacity.stop_after_attempt(3)) @tenacity.retry(stop=tenacity.stop_after_attempt(3),
wait=tenacity.wait_fixed(2))
def check_net(): def check_net():
urls = ['http://ipinfo.io/json', 'http://ipconfig.io/json'] urls = ['http://ipinfo.io/json', 'http://ipconfig.io/json']
url = random.choice(urls) url = random.choice(urls)
@@ -514,17 +515,12 @@ def check_net():
rsp = session.get(url, headers=header, timeout=timeout, verify=verify) rsp = session.get(url, headers=header, timeout=timeout, verify=verify)
except Exception as e: except Exception as e:
logger.log('ERROR', e.args) logger.log('ERROR', e.args)
logger.log('ALERT', 'Can not access Internet, retrying') logger.log('ALERT', 'Unable to access Internet, retrying...')
raise tenacity.TryAgain raise e
if rsp.status_code != 200:
logger.log('ALERT', f'{rsp.request.method} {rsp.request.url} '
f'{rsp.status_code} {rsp.reason}')
logger.log('ALERT', 'Can not access Internet normally, retrying')
raise tenacity.TryAgain
logger.log('DEBUG', 'Access to Internet OK') logger.log('DEBUG', 'Access to Internet OK')
country = rsp.json().get('country').lower() country = rsp.json().get('country').lower()
if country in ['cn', 'china']: if country in ['cn', 'china']:
logger.log('DEBUG', f'The host in china') logger.log('DEBUG', f'The computer is located in China')
return True, True return True, True
else: else:
return True, False return True, False
@@ -548,7 +544,7 @@ def get_net_env():
result = check_net() result = check_net()
except Exception as e: except Exception as e:
logger.log('DEBUG', e.args) logger.log('DEBUG', e.args)
logger.log('ALERT', 'Can not access Internet') logger.log('ALERT', 'Please check your network environment.')
return False, None return False, None
return result return result