diff --git a/brute.py b/brute.py index cddac2e..36aa57b 100644 --- a/brute.py +++ b/brute.py @@ -271,7 +271,7 @@ def get_wildcard_record(domain, resolver): except Timeout as e: logger.log('ALERT', f'Query timeout, retrying') logger.log('DEBUG', e.args) - raise tenacity.TryAgain + raise e except (NXDOMAIN, YXDOMAIN, NoAnswer, NoNameservers) as e: logger.log('DEBUG', e.args) logger.log('DEBUG', f'{domain} dont have A record on authoritative name server') diff --git a/common/utils.py b/common/utils.py index 2cc74ba..97a4212 100644 --- a/common/utils.py +++ b/common/utils.py @@ -500,7 +500,8 @@ def delete_file(*paths): 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(): urls = ['http://ipinfo.io/json', 'http://ipconfig.io/json'] url = random.choice(urls) @@ -514,17 +515,12 @@ def check_net(): rsp = session.get(url, headers=header, timeout=timeout, verify=verify) except Exception as e: logger.log('ERROR', e.args) - logger.log('ALERT', 'Can not access Internet, retrying') - raise tenacity.TryAgain - 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('ALERT', 'Unable to access Internet, retrying...') + raise e logger.log('DEBUG', 'Access to Internet OK') country = rsp.json().get('country').lower() 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 else: return True, False @@ -548,7 +544,7 @@ def get_net_env(): result = check_net() except Exception as e: logger.log('DEBUG', e.args) - logger.log('ALERT', 'Can not access Internet') + logger.log('ALERT', 'Please check your network environment.') return False, None return result