Merge pull request #206 from flashbots/fix-pricing

Only import the worker where needed
This commit is contained in:
Luke Van Seters 2022-01-04 12:21:29 -05:00 committed by GitHub
commit 8ba0f86569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

5
cli.py
View File

@ -3,7 +3,6 @@ import os
import sys import sys
import click import click
from worker import inspect_many_blocks_task
from mev_inspect.concurrency import coro from mev_inspect.concurrency import coro
from mev_inspect.crud.prices import write_prices from mev_inspect.crud.prices import write_prices
@ -97,6 +96,10 @@ async def inspect_many_blocks_command(
@click.argument("before_block", type=int) @click.argument("before_block", type=int)
@click.argument("batch_size", type=int, default=10) @click.argument("batch_size", type=int, default=10)
def enqueue_many_blocks_command(after_block: int, before_block: int, batch_size: int): def enqueue_many_blocks_command(after_block: int, before_block: int, batch_size: int):
from worker import ( # pylint: disable=import-outside-toplevel
inspect_many_blocks_task,
)
for batch_after_block in range(after_block, before_block, batch_size): for batch_after_block in range(after_block, before_block, batch_size):
batch_before_block = min(batch_after_block + batch_size, before_block) batch_before_block = min(batch_after_block + batch_size, before_block)
logger.info(f"Sending {batch_after_block} to {batch_before_block}") logger.info(f"Sending {batch_after_block} to {batch_before_block}")

View File

@ -38,6 +38,8 @@ class InspectorMiddleware(Middleware):
def before_process_message( def before_process_message(
self, _broker, worker self, _broker, worker
): # pylint: disable=unused-argument ): # pylint: disable=unused-argument
rpc = os.environ["RPC_URL"]
if not hasattr(thread_local, "inspector"): if not hasattr(thread_local, "inspector"):
logger.info("Building inspector") logger.info("Building inspector")
thread_local.inspector = MEVInspector( thread_local.inspector = MEVInspector(
@ -49,7 +51,6 @@ class InspectorMiddleware(Middleware):
logger.info("Inspector already exists") logger.info("Inspector already exists")
rpc = os.environ["RPC_URL"]
broker = RedisBroker(host="redis-master", password=os.environ["REDIS_PASSWORD"]) broker = RedisBroker(host="redis-master", password=os.environ["REDIS_PASSWORD"])
broker.add_middleware(AsyncMiddleware()) broker.add_middleware(AsyncMiddleware())
broker.add_middleware(InspectorMiddleware()) broker.add_middleware(InspectorMiddleware())