From 4447bc65d94fff6d16571fbb0f4380663ceff503 Mon Sep 17 00:00:00 2001 From: cyc60 Date: Mon, 7 Nov 2022 20:53:52 +0300 Subject: [PATCH] Increase ipfs timeouts Signed-off-by: cyc60 --- oracle/common/__init__.py | 0 oracle/oracle/common/ipfs.py | 12 ++++++------ oracle/oracle/distributor/ipfs.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 oracle/common/__init__.py diff --git a/oracle/common/__init__.py b/oracle/common/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/oracle/oracle/common/ipfs.py b/oracle/oracle/common/ipfs.py index 41640dbb..b99613b1 100644 --- a/oracle/oracle/common/ipfs.py +++ b/oracle/oracle/common/ipfs.py @@ -16,7 +16,7 @@ logger = logging.getLogger(__name__) -timeout = ClientTimeout(total=60) +timeout = ClientTimeout(total=180) CACHE_SIZE = 1024 IPFS_CACHE = LimitedSizeDict(size_limit=CACHE_SIZE) @@ -41,24 +41,24 @@ async def _fetch(_ipfs_hash): return await response.json() except BaseException as e: # noqa: E722 logger.exception(e) - pass if LOCAL_IPFS_CLIENT_ENDPOINT: try: with ipfshttpclient.connect(LOCAL_IPFS_CLIENT_ENDPOINT) as client: return client.get_json(_ipfs_hash) - except ipfshttpclient.exceptions.TimeoutError: - pass + except BaseException as e: # noqa: E722 + logger.exception(e) try: with ipfshttpclient.connect( INFURA_IPFS_CLIENT_ENDPOINT, username=INFURA_IPFS_CLIENT_USERNAME, password=INFURA_IPFS_CLIENT_PASSWORD, + timeout=180, ) as client: return client.get_json(_ipfs_hash) - except ipfshttpclient.exceptions.TimeoutError: - pass + except BaseException as e: # noqa: E722 + logger.exception(e) data = await _fetch(_ipfs_hash) if data: diff --git a/oracle/oracle/distributor/ipfs.py b/oracle/oracle/distributor/ipfs.py index b309a956..40451243 100644 --- a/oracle/oracle/distributor/ipfs.py +++ b/oracle/oracle/distributor/ipfs.py @@ -73,6 +73,7 @@ async def upload_claims(claims: Claims) -> str: INFURA_IPFS_CLIENT_ENDPOINT, username=INFURA_IPFS_CLIENT_USERNAME, password=INFURA_IPFS_CLIENT_PASSWORD, + timeout=180, ) as client: ipfs_id = client.add_json(claims) client.pin.add(ipfs_id) @@ -107,7 +108,6 @@ async def upload_claims(claims: Claims) -> str: ipfs_ids.append(ipfs_id) except Exception as e: # noqa: E722 logger.error(e) - logger.error("Failed to submit claims to Pinata") if not ipfs_ids: raise RuntimeError("Failed to submit claims to IPFS")