Skip to content

Commit 35e1042

Browse files
committed
Add logs and run function in a single process
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 2a2bbee commit 35e1042

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

vulnerabilities/pipelines/recompute_content_ids.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def process_advisories(
8383
this can result in a significant reduction in memory usage.
8484
"""
8585
advisories_count = advisories.count()
86-
logger.info(f"Process {advisories_count} advisories with {advisory_func.__name__}")
86+
log(f"Process {advisories_count} advisories with {advisory_func.__name__}", level=logging.INFO)
8787
progress = LoopProgress(advisories_count, logger=log)
8888
max_workers = get_max_workers(keep_available=4)
8989

@@ -93,14 +93,18 @@ def process_advisories(
9393
log=log,
9494
)
9595

96-
if max_workers <= 0:
96+
log(f"Running function: {advisory_func.__name__}", level=logging.INFO)
97+
# if max_workers <= 0:
98+
if True:
99+
log(f"Running function in single process", level=logging.INFO)
97100
for advisory_ids in progress.iter(advisory_batches):
98101
progress.log_progress()
99-
logger.debug(f"{advisory_func.__name__} len={len(advisory_ids)}")
100102
advisory_func(advisory_ids=advisory_ids, logger=log)
101103
return
102104

103-
logger.info(f"Starting ProcessPoolExecutor with {max_workers} max_workers")
105+
log(
106+
f"Running function in multiple processes with {max_workers} max_workers", level=logging.INFO
107+
)
104108

105109
with futures.ProcessPoolExecutor(max_workers) as executor:
106110
future_to_advisories = {
@@ -113,7 +117,6 @@ def process_advisories(
113117
for future in progress.iter(future_as_completed):
114118
advisory_ids = future_to_advisories[future]
115119
progress.log_progress()
116-
logger.debug(f"{advisory_func.__name__} len={len(advisory_ids)}")
117120
try:
118121
future.result()
119122
except futures.process.BrokenProcessPool as broken_pool_error:
@@ -131,6 +134,7 @@ def get_advisory_batches(advisories, batch_size=1000, log=None):
131134
"""
132135
paginator = Paginator(advisories, per_page=batch_size)
133136
for page_number in paginator.page_range:
137+
log(f"Getting advisory batch {page_number}", level=logging.INFO)
134138
page = paginator.page(page_number)
135139
advisory_ids = None
136140
try:

0 commit comments

Comments
 (0)