Skip to content

Commit 958392a

Browse files
committed
Merge branch 'release/0.8.3'
2 parents cd4104f + 20fc5f2 commit 958392a

File tree

4 files changed

+5
-26
lines changed

4 files changed

+5
-26
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "taskiq"
3-
version = "0.8.2"
3+
version = "0.8.3"
44
description = "Distributed task queue with full async support"
55
authors = ["Pavel Kirilin <[email protected]>"]
66
maintainers = ["Pavel Kirilin <[email protected]>"]

taskiq/__init__.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""Distributed task manager."""
2+
from importlib.metadata import version
3+
24
from taskiq_dependencies import Depends as TaskiqDepends
35

46
from taskiq.abc.broker import AsyncBroker, AsyncTaskiqDecoratedTask
@@ -30,13 +32,6 @@
3032
from taskiq.state import TaskiqState
3133
from taskiq.task import AsyncTaskiqTask
3234

33-
try:
34-
# Python 3.8+
35-
from importlib.metadata import version # noqa: WPS433
36-
except ImportError:
37-
# Python 3.7
38-
from importlib_metadata import version # noqa: WPS433
39-
4035
__version__ = version("taskiq")
4136
__all__ = [
4237
"__version__",

taskiq/abc/broker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ async def startup(self) -> None:
153153

154154
for middleware in self.middlewares:
155155
if middleware.__class__.startup != TaskiqMiddleware.startup:
156-
await maybe_awaitable(middleware.startup)
156+
await maybe_awaitable(middleware.startup())
157157

158158
await self.result_backend.startup()
159159

taskiq/middlewares/prometheus_middleware.py

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ def __init__(
2929
) -> None:
3030
super().__init__()
3131

32-
self.found_errors = None
33-
self.received_tasks = None
34-
self.success_tasks = None
35-
self.saved_results = None
36-
self.execution_time = None
37-
3832
metrics_path = metrics_path or Path(gettempdir()) / "taskiq_worker"
3933

4034
if not metrics_path.exists():
@@ -76,7 +70,7 @@ def __init__(
7670
)
7771
self.execution_time = Histogram(
7872
"execution_time",
79-
"Tome of function execution",
73+
"Time of function execution",
8074
["task_name"],
8175
)
8276
self.server_port = server_port
@@ -110,8 +104,6 @@ def pre_execute(
110104
:param message: current message.
111105
:return: message
112106
"""
113-
if self.received_tasks is None:
114-
return message
115107
self.received_tasks.labels(message.task_name).inc()
116108
return message
117109

@@ -126,12 +118,6 @@ def post_execute(
126118
:param message: received message.
127119
:param result: result of the execution.
128120
"""
129-
if ( # noqa: WPS337
130-
self.success_tasks is None
131-
or self.execution_time is None
132-
or self.found_errors is None
133-
):
134-
return
135121
if result.is_err:
136122
self.found_errors.labels(message.task_name).inc()
137123
else:
@@ -149,6 +135,4 @@ def post_save(
149135
:param message: received message.
150136
:param result: result of execution.
151137
"""
152-
if self.saved_results is None:
153-
return
154138
self.saved_results.labels(message.task_name).inc()

0 commit comments

Comments
 (0)