From b1d4cb852b9db93113c96494df8803bc4fbaff63 Mon Sep 17 00:00:00 2001 From: Luke Van Seters Date: Fri, 4 Feb 2022 15:30:20 -0500 Subject: [PATCH] Add some logging. Remove unused list function --- cli.py | 4 +--- mev_inspect/s3_export.py | 13 +++++-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/cli.py b/cli.py index 8a78314..b25d2a6 100644 --- a/cli.py +++ b/cli.py @@ -13,7 +13,7 @@ from mev_inspect.inspector import MEVInspector from mev_inspect.prices import fetch_prices, fetch_prices_range from mev_inspect.queue.broker import connect_broker from mev_inspect.queue.tasks import inspect_many_blocks_task -from mev_inspect.s3_export import export_block_range, list_export_bucket +from mev_inspect.s3_export import export_block_range RPC_URL_ENV = "RPC_URL" @@ -126,8 +126,6 @@ def fetch_all_prices(): @click.argument("before_block_number", type=int) def s3_export(after_block_number: int, before_block_number: int): inspect_db_session = get_inspect_session() - - print(list_export_bucket()) export_block_range(inspect_db_session, after_block_number, before_block_number) diff --git a/mev_inspect/s3_export.py b/mev_inspect/s3_export.py index b27c472..8b7aba1 100644 --- a/mev_inspect/s3_export.py +++ b/mev_inspect/s3_export.py @@ -1,4 +1,5 @@ import json +import logging import boto3 @@ -12,6 +13,8 @@ MEV_SUMMARY_EXPORT_QUERY = """ block_number < :before_block_number """ +logger = logging.getLogger(__name__) + def export_block_range( inspect_db_session, after_block_number: int, before_block_number @@ -39,13 +42,7 @@ def export_block_range( Key=key, ) - -def list_export_bucket(): - client = get_s3_client() - return client.list_objects_v2( - Bucket=get_export_bucket_name(), - Prefix="/", - ) + logger.info(f"Exported to {key}") # TODO - replaced by ConfigMap @@ -53,7 +50,7 @@ def get_export_bucket_name() -> str: return "local-export" -# TODO +# TODO - handle for production def get_s3_client(): return boto3.client( "s3",