33from pathlib import Path , PurePath
44import subprocess
55import sys
6- from tempfile import TemporaryDirectory
76from textwrap import indent
87from typing import Optional , List , Dict , Tuple
98import shutil
109
1110from ..common_fs import FileObj
12- from ..loggers import start_log_group , end_log_group , worker_log_file_init , logger
11+ from ..loggers import start_log_group , end_log_group , worker_log_init , logger
1312from .clang_tidy import run_clang_tidy , TidyAdvice
1413from .clang_format import run_clang_format , FormatAdvice
1514
@@ -36,7 +35,6 @@ def assemble_version_exec(tool_name: str, specified_version: str) -> Optional[st
3635
3736def _run_on_single_file (
3837 file : FileObj ,
39- temp_dir : str ,
4038 log_lvl : int ,
4139 tidy_cmd ,
4240 checks ,
@@ -49,7 +47,7 @@ def _run_on_single_file(
4947 style ,
5048 format_review ,
5149):
52- log_file = worker_log_file_init ( temp_dir , log_lvl )
50+ log_stream = worker_log_init ( log_lvl )
5351
5452 tidy_note = None
5553 if tidy_cmd is not None :
@@ -70,7 +68,7 @@ def _run_on_single_file(
7068 format_cmd , file , style , lines_changed_only , format_review
7169 )
7270
73- return file .name , log_file , tidy_note , format_advice
71+ return file .name , log_stream . getvalue () , tidy_note , format_advice
7472
7573
7674def capture_clang_tools_output (
@@ -131,13 +129,12 @@ def show_tool_version_output(cmd: str): # show version output for executable us
131129 if db_path .exists ():
132130 db_json = json .loads (db_path .read_text (encoding = "utf-8" ))
133131
134- with TemporaryDirectory () as temp_dir , ProcessPoolExecutor (num_workers ) as executor :
132+ with ProcessPoolExecutor (num_workers ) as executor :
135133 log_lvl = logger .getEffectiveLevel ()
136134 futures = [
137135 executor .submit (
138136 _run_on_single_file ,
139137 file ,
140- temp_dir = temp_dir ,
141138 log_lvl = log_lvl ,
142139 tidy_cmd = tidy_cmd ,
143140 checks = checks ,
@@ -157,10 +154,10 @@ def show_tool_version_output(cmd: str): # show version output for executable us
157154 format_advice_map : Dict [str , Optional [FormatAdvice ]] = {}
158155 tidy_notes_map : Dict [str , Optional [TidyAdvice ]] = {}
159156 for future in as_completed (futures ):
160- file , log_file , note , advice = future .result ()
157+ file , logs , note , advice = future .result ()
161158
162159 start_log_group (f"Performing checkup on { file } " )
163- sys .stdout .write (Path ( log_file ). read_text () )
160+ sys .stdout .write (logs )
164161 end_log_group ()
165162
166163 format_advice_map [file ] = advice
0 commit comments