From 4bef4f9490adb810c3c631608ff62013336605bc Mon Sep 17 00:00:00 2001 From: BobTheBuidler <70677534+BobTheBuidler@users.noreply.github.com> Date: Wed, 10 Jan 2024 22:33:21 -0500 Subject: [PATCH 1/4] feat: ETH_RETRY_SUPPRESS_LOGS env var --- eth_retry/ENVIRONMENT_VARIABLES.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eth_retry/ENVIRONMENT_VARIABLES.py b/eth_retry/ENVIRONMENT_VARIABLES.py index a0fd7b5..1e01018 100644 --- a/eth_retry/ENVIRONMENT_VARIABLES.py +++ b/eth_retry/ENVIRONMENT_VARIABLES.py @@ -3,6 +3,8 @@ ETH_RETRY_DISABLED = bool(os.environ.get("ETH_RETRY_DISABLED")) ETH_RETRY_DEBUG = bool(os.environ.get("ETH_RETRY_DEBUG")) -MIN_SLEEP_TIME = int(os.environ.get("MIN_SLEEP_TIME", 10)) -MAX_SLEEP_TIME = int(os.environ.get("MAX_SLEEP_TIME", 20)) +ETH_RETRY_SUPPRESS_LOGS = int(os.environ.get("ETH_RETRY_SUPPRESS_LOGS", 0)) +MIN_SLEEP_TIME = int(os.environ.get("MIN_SLEEP_TIME", 5)) +MAX_SLEEP_TIME = int(os.environ.get("MAX_SLEEP_TIME", 15)) MAX_RETRIES = int(os.environ.get("MAX_RETRIES", 10)) +# NOTE: this will suppress logs up to `` times, then they will log as usual From d2d8259566fcc300a1207192e5e3017e3ba68039 Mon Sep 17 00:00:00 2001 From: BobTheBuidler <70677534+BobTheBuidler@users.noreply.github.com> Date: Wed, 10 Jan 2024 22:36:03 -0500 Subject: [PATCH 2/4] feat: suppress logs --- eth_retry/eth_retry.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eth_retry/eth_retry.py b/eth_retry/eth_retry.py index ca2d45c..8fd15a5 100644 --- a/eth_retry/eth_retry.py +++ b/eth_retry/eth_retry.py @@ -64,7 +64,8 @@ def auto_retry_wrap(*args: P.args, **kwargs: P.kwargs) -> T: except Exception as e: if not should_retry(e, failures): raise - logger.warning(f'{str(e)} [{failures}]') + if failures > ENVS.ETH_RETRY_SUPPRESS_LOGS: + logger.warning(f'{str(e)} [{failures}]') if ENVS.ETH_RETRY_DEBUG: logger.exception(e) @@ -89,7 +90,8 @@ async def auto_retry_wrap_async(*args: P.args, **kwargs: P.kwargs) -> T: except Exception as e: if not should_retry(e, failures): raise - logger.warning(f'{str(e)} [{failures}]') + if failures > ENVS.ETH_RETRY_SUPPRESS_LOGS: + logger.warning(f'{str(e)} [{failures}]') if ENVS.ETH_RETRY_DEBUG: logger.exception(e) From 1e6d61be011a4c5ded3aeb0ec72013ef15f4ea93 Mon Sep 17 00:00:00 2001 From: BobTheBuidler <70677534+BobTheBuidler@users.noreply.github.com> Date: Wed, 10 Jan 2024 22:36:25 -0500 Subject: [PATCH 3/4] chore: change default --- eth_retry/ENVIRONMENT_VARIABLES.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eth_retry/ENVIRONMENT_VARIABLES.py b/eth_retry/ENVIRONMENT_VARIABLES.py index 1e01018..d96ac7a 100644 --- a/eth_retry/ENVIRONMENT_VARIABLES.py +++ b/eth_retry/ENVIRONMENT_VARIABLES.py @@ -3,7 +3,7 @@ ETH_RETRY_DISABLED = bool(os.environ.get("ETH_RETRY_DISABLED")) ETH_RETRY_DEBUG = bool(os.environ.get("ETH_RETRY_DEBUG")) -ETH_RETRY_SUPPRESS_LOGS = int(os.environ.get("ETH_RETRY_SUPPRESS_LOGS", 0)) +ETH_RETRY_SUPPRESS_LOGS = int(os.environ.get("ETH_RETRY_SUPPRESS_LOGS", -1)) MIN_SLEEP_TIME = int(os.environ.get("MIN_SLEEP_TIME", 5)) MAX_SLEEP_TIME = int(os.environ.get("MAX_SLEEP_TIME", 15)) MAX_RETRIES = int(os.environ.get("MAX_RETRIES", 10)) From 8a789ff94ccdaa241d00f7e51b2b11affd2c5cd2 Mon Sep 17 00:00:00 2001 From: BobTheBuidler <70677534+BobTheBuidler@users.noreply.github.com> Date: Wed, 10 Jan 2024 22:36:49 -0500 Subject: [PATCH 4/4] Update ENVIRONMENT_VARIABLES.py --- eth_retry/ENVIRONMENT_VARIABLES.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eth_retry/ENVIRONMENT_VARIABLES.py b/eth_retry/ENVIRONMENT_VARIABLES.py index d96ac7a..4105fd2 100644 --- a/eth_retry/ENVIRONMENT_VARIABLES.py +++ b/eth_retry/ENVIRONMENT_VARIABLES.py @@ -3,8 +3,8 @@ ETH_RETRY_DISABLED = bool(os.environ.get("ETH_RETRY_DISABLED")) ETH_RETRY_DEBUG = bool(os.environ.get("ETH_RETRY_DEBUG")) +# NOTE: this will suppress logs up to `ETH_RETRY_SUPPRESS_LOGS` times, then they will log as usual ETH_RETRY_SUPPRESS_LOGS = int(os.environ.get("ETH_RETRY_SUPPRESS_LOGS", -1)) MIN_SLEEP_TIME = int(os.environ.get("MIN_SLEEP_TIME", 5)) MAX_SLEEP_TIME = int(os.environ.get("MAX_SLEEP_TIME", 15)) MAX_RETRIES = int(os.environ.get("MAX_RETRIES", 10)) -# NOTE: this will suppress logs up to `` times, then they will log as usual