From da04bc4351d4bd95fa36fded078602ba90b47557 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Mon, 21 Feb 2022 10:59:14 -0500 Subject: [PATCH] Add tasks to CLI --- cli.py | 11 +++++------ mev_inspect/queue/tasks.py | 5 ----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/cli.py b/cli.py index e03de61..ca37135 100644 --- a/cli.py +++ b/cli.py @@ -15,10 +15,9 @@ from mev_inspect.prices import fetch_prices, fetch_prices_range from mev_inspect.queue.broker import connect_broker from mev_inspect.queue.tasks import ( HIGH_PRIORITY, - HIGH_PRIORITY_QUEUE, LOW_PRIORITY, LOW_PRIORITY_QUEUE, - export_block_task, + backfill_export_task, inspect_many_blocks_task, ) from mev_inspect.s3_export import export_block @@ -167,9 +166,9 @@ def fetch_all_prices(): def enqueue_s3_export(block_number: int): broker = connect_broker() export_actor = dramatiq.actor( - export_block_task, + backfill_export_task, broker=broker, - queue_name=HIGH_PRIORITY_QUEUE, + queue_name=LOW_PRIORITY_QUEUE, priority=HIGH_PRIORITY, ) logger.info(f"Sending block {block_number} export to queue") @@ -182,10 +181,10 @@ def enqueue_s3_export(block_number: int): def enqueue_many_s3_exports(after_block: int, before_block: int): broker = connect_broker() export_actor = dramatiq.actor( - export_block_task, + backfill_export_task, broker=broker, queue_name=LOW_PRIORITY_QUEUE, - priority=LOW_PRIORITY, + priority=HIGH_PRIORITY, ) logger.info(f"Sending blocks {after_block} to {before_block} to queue") for block_number in range(after_block, before_block): diff --git a/mev_inspect/queue/tasks.py b/mev_inspect/queue/tasks.py index 51359a6..9e45b4d 100644 --- a/mev_inspect/queue/tasks.py +++ b/mev_inspect/queue/tasks.py @@ -32,11 +32,6 @@ def inspect_many_blocks_task( ) -def export_block_task(block_number: int): - with _session_scope(DbMiddleware.get_inspect_sessionmaker()) as inspect_db_session: - export_block(inspect_db_session, block_number) - - def realtime_export_task(block_number: int): with _session_scope(DbMiddleware.get_inspect_sessionmaker()) as inspect_db_session: export_block(inspect_db_session, block_number)