Skip to content

Commit 5af7426

Browse files
Revert "Improves logging and test debug visibility"
This reverts commit 22df4d8.
1 parent 22df4d8 commit 5af7426

File tree

4 files changed

+3
-20
lines changed

4 files changed

+3
-20
lines changed

packages/service-library/src/servicelib/redis/_decorators.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ def exclusive(
5353
lock_key -- a string as the name of the lock (good practice: app_name:lock_name)
5454
lock_value -- some additional data that can be retrieved by another client if None,
5555
it will be automatically filled with the current time and the client name
56-
blocking -- If ``blocking`` is False, always return immediately. If the lock
57-
was acquired, return True, otherwise return False.
58-
blocking_timeout -- specifies the maximum number of seconds to
59-
wait trying to acquire the lock.
6056
6157
Raises:
6258
- ValueError if used incorrectly
@@ -89,21 +85,14 @@ async def _wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
8985
lock_value = f"locked since {arrow.utcnow().format()} by {client.client_name} on {socket.gethostname()}"
9086

9187
lock = client.create_lock(redis_lock_key, ttl=DEFAULT_LOCK_TTL)
92-
_logger.debug(
93-
"Acquiring lock '%s' with value '%s' for coroutine '%s'",
94-
redis_lock_key,
95-
lock_value,
96-
coro.__name__,
97-
stacklevel=3,
98-
)
9988
if not await lock.acquire(
10089
token=lock_value,
10190
blocking=blocking,
10291
blocking_timeout=(
10392
blocking_timeout.total_seconds() if blocking_timeout else None
10493
),
10594
):
106-
raise CouldNotAcquireLockError(lock=lock) # <-- HERE
95+
raise CouldNotAcquireLockError(lock=lock)
10796

10897
try:
10998
async with asyncio.TaskGroup() as tg:

scripts/common-service.Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ _run-test-ci: _check_venv_active
175175
--log-date-format="%Y-%m-%d %H:%M:%S" \
176176
--log-format="%(asctime)s %(levelname)s %(message)s" \
177177
--verbose \
178-
--log-cli-level=DEBUG \
179178
-m "not heavy_load" \
180179
$(PYTEST_ADDITIONAL_PARAMETERS) \
181180
$(TEST_TARGET)

services/web/server/src/simcore_service_webserver/projects/_projects_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ async def _remove_service_and_its_data_folders(
10601060
)
10611061

10621062
# remove the node's data if any
1063-
await storage_service.delete_data_folders_of_project_node( # <-- MD: this one
1063+
await storage_service.delete_data_folders_of_project_node(
10641064
app, f"{project_uuid}", node_uuid, user_id
10651065
)
10661066

services/web/server/tests/unit/with_dbs/conftest.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -417,12 +417,7 @@ async def _mock_result() -> None:
417417
return_value=TypeAdapter(ByteSize).validate_python("1Gib"),
418418
)
419419

420-
return MockedStorageSubsystem(
421-
copy_data_folders_from_project=mock,
422-
delete_project=mock1,
423-
delete_node=mock2,
424-
get_project_total_size_simcore_s3=mock3,
425-
)
420+
return MockedStorageSubsystem(mock, mock1, mock2, mock3)
426421

427422

428423
@pytest.fixture

0 commit comments

Comments
 (0)