Skip to content

Commit 1e5e976

Browse files
committed
Use whitespace in default redirect logger name instead of -
1 parent 335b8c3 commit 1e5e976

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

src/apify_client/_logging.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,5 +164,5 @@ def format(self, record: logging.LogRecord) -> str:
164164
Returns:
165165
Formated log message.
166166
"""
167-
formated_logger_name = f'{Fore.CYAN}[{record.name}]{Style.RESET_ALL} '
168-
return f'{formated_logger_name}-> {record.msg}'
167+
formated_logger_name = f'{Fore.CYAN}[{record.name}]{Style.RESET_ALL}'
168+
return f'{formated_logger_name} -> {record.msg}'

src/apify_client/clients/resource_clients/run.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ def get_streamed_log(self, to_logger: logging.Logger | None = None, *, from_star
281281
actor_name = actor_data.get('name', '') if run_data else ''
282282

283283
if not to_logger:
284-
name = '-'.join(part for part in (actor_name, run_id) if part)
284+
name = ' '.join(part for part in (actor_name, run_id) if part)
285285
to_logger = create_redirect_logger(f'apify.{name}')
286286

287287
return StreamedLogSync(log_client=self.log(), to_logger=to_logger, from_start=from_start)
@@ -345,7 +345,7 @@ def get_status_message_watcher(
345345
actor_name = actor_data.get('name', '') if run_data else ''
346346

347347
if not to_logger:
348-
name = '-'.join(part for part in (actor_name, run_id) if part)
348+
name = ' '.join(part for part in (actor_name, run_id) if part)
349349
to_logger = create_redirect_logger(f'apify.{name}')
350350

351351
return StatusMessageWatcherSync(run_client=self, to_logger=to_logger, check_period=check_period)
@@ -605,7 +605,7 @@ async def get_streamed_log(
605605
actor_name = actor_data.get('name', '') if run_data else ''
606606

607607
if not to_logger:
608-
name = '-'.join(part for part in (actor_name, run_id) if part)
608+
name = ' '.join(part for part in (actor_name, run_id) if part)
609609
to_logger = create_redirect_logger(f'apify.{name}')
610610

611611
return StreamedLogAsync(log_client=self.log(), to_logger=to_logger, from_start=from_start)
@@ -670,7 +670,7 @@ async def get_status_message_watcher(
670670
actor_name = actor_data.get('name', '') if run_data else ''
671671

672672
if not to_logger:
673-
name = '-'.join(part for part in (actor_name, run_id) if part)
673+
name = ' '.join(part for part in (actor_name, run_id) if part)
674674
to_logger = create_redirect_logger(f'apify.{name}')
675675

676676
return StatusMessageWatcherAsync(run_client=self, to_logger=to_logger, check_period=check_period)

tests/unit/test_logging.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
b'2025-05-13T07:27:14.132Z [apify] DEB', # Chunked log that got split outside of marker
3535
b'UG e\n', # part 2
3636
# Already redirected message
37-
b'2025-05-13T07:28:14.132Z [apify.redirect-logger-4U1oAnKau6jpzjUuA] -> 2025-05-13T07:27:14.132Z ACTOR: Pulling\n',
37+
b'2025-05-13T07:28:14.132Z [apify.redirect-logger runId:4U1oAnKau6jpzjUuA] -> 2025-05-13T07:27:14.132Z ACTOR:...\n',
3838
)
3939
_EXISTING_LOGS_BEFORE_REDIRECT_ATTACH = 3
4040

@@ -49,7 +49,8 @@
4949
('2025-05-13T07:26:14.132Z [apify] DEBUG d', logging.DEBUG),
5050
('2025-05-13T07:27:14.132Z [apify] DEBUG e', logging.DEBUG),
5151
(
52-
'2025-05-13T07:28:14.132Z [apify.redirect-logger-4U1oAnKau6jpzjUuA] -> 2025-05-13T07:27:14.132Z ACTOR: Pulling',
52+
'2025-05-13T07:28:14.132Z [apify.redirect-logger runId:4U1oAnKau6jpzjUuA] -> '
53+
'2025-05-13T07:27:14.132Z ACTOR:...',
5354
logging.INFO,
5455
),
5556
)
@@ -265,7 +266,7 @@ async def test_actor_call_redirect_logs_to_default_logger_async(
265266
"""Test that logs are redirected correctly to the default logger.
266267
267268
Caplog contains logs before formatting, so formatting is not included in the test expectations."""
268-
logger_name = f'apify.{_MOCKED_ACTOR_NAME}-runId:{_MOCKED_RUN_ID}'
269+
logger_name = f'apify.{_MOCKED_ACTOR_NAME} runId:{_MOCKED_RUN_ID}'
269270
logger = logging.getLogger(logger_name)
270271
actor_client = ApifyClientAsync(token='mocked_token', api_url=_MOCKED_API_URL).actor(actor_id=_MOCKED_ACTOR_ID)
271272

@@ -293,7 +294,7 @@ def test_actor_call_redirect_logs_to_default_logger_sync(
293294
"""Test that logs are redirected correctly to the default logger.
294295
295296
Caplog contains logs before formatting, so formatting is not included in the test expectations."""
296-
logger_name = f'apify.{_MOCKED_ACTOR_NAME}-runId:{_MOCKED_RUN_ID}'
297+
logger_name = f'apify.{_MOCKED_ACTOR_NAME} runId:{_MOCKED_RUN_ID}'
297298
logger = logging.getLogger(logger_name)
298299
actor_client = ApifyClient(token='mocked_token', api_url=_MOCKED_API_URL).actor(actor_id=_MOCKED_ACTOR_ID)
299300

0 commit comments

Comments
 (0)