Skip to content

Commit 2380c61

Browse files
author
Andrei Neagu
committed
removed uncecessary code
1 parent e9ad6dc commit 2380c61

File tree

1 file changed

+6
-38
lines changed
  • packages/service-library/src/servicelib/long_running_tasks

1 file changed

+6
-38
lines changed

packages/service-library/src/servicelib/long_running_tasks/lrt_api.py

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import logging
22
from typing import Any
33

4-
from common_library.error_codes import create_error_code
54
from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
65

7-
from ..logging_errors import create_troubleshootting_log_kwargs
86
from ._rabbit import lrt_client, lrt_server
97
from ._rabbit.namespace import get_namespace
108
from .base_long_running_manager import BaseLongRunningManager
11-
from .errors import TaskNotCompletedError, TaskNotFoundError
129
from .models import TaskBase, TaskContext, TaskId, TaskStatus
1310
from .task import RegisteredTaskName
1411

@@ -97,41 +94,12 @@ async def get_task_result(
9794
task_context: TaskContext,
9895
task_id: TaskId,
9996
) -> Any:
100-
try:
101-
task_result = await lrt_client.get_task_result(
102-
rabbitmq_rpc_client,
103-
long_running_manager.rabbit_namespace,
104-
task_context=task_context,
105-
task_id=task_id,
106-
)
107-
await lrt_client.remove_task(
108-
rabbitmq_rpc_client,
109-
long_running_manager.rabbit_namespace,
110-
task_id=task_id,
111-
task_context=task_context,
112-
reraise_errors=False,
113-
)
114-
return task_result
115-
except (TaskNotFoundError, TaskNotCompletedError):
116-
raise
117-
except Exception as exc:
118-
_logger.exception(
119-
**create_troubleshootting_log_kwargs(
120-
user_error_msg=f"{task_id=} raised an exception while getting its result",
121-
error=exc,
122-
error_code=create_error_code(exc),
123-
error_context={"task_context": task_context, "task_id": task_id},
124-
),
125-
)
126-
# the task shall be removed in this case
127-
await lrt_client.remove_task(
128-
rabbitmq_rpc_client,
129-
long_running_manager.rabbit_namespace,
130-
task_id=task_id,
131-
task_context=task_context,
132-
reraise_errors=False,
133-
)
134-
raise
97+
return await lrt_client.get_task_result(
98+
rabbitmq_rpc_client,
99+
long_running_manager.rabbit_namespace,
100+
task_context=task_context,
101+
task_id=task_id,
102+
)
135103

136104

137105
async def remove_task(

0 commit comments

Comments
 (0)