Merge branch 'release/0.8.5'

Author: s3rius

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "taskiq"
-version = "0.8.4"
+version = "0.8.5"
 description = "Distributed task queue with full async support"
 authors = ["Pavel Kirilin <[email protected]>"]
 maintainers = ["Pavel Kirilin <[email protected]>"]

taskiq/cli/scheduler/args.py

@@ -13,6 +13,7 @@ class SchedulerArgs:
     scheduler: Union[str, TaskiqScheduler]
     modules: List[str]
     log_level: str = LogLevel.INFO.name
+    configure_logging: bool = True
     fs_discover: bool = False
     tasks_pattern: str = "tasks.py"
 
@@ -59,4 +60,10 @@ def from_cli(cls, args: Optional[Sequence[str]] = None) -> "SchedulerArgs":
             choices=[level.name for level in LogLevel],
             help="scheduler log level",
         )
+        parser.add_argument(
+            "--no-configure-logging",
+            action="store_false",
+            dest="configure_logging",
+            help="Use this parameter if your application configures custom logging.",
+        )
         return cls(**parser.parse_args(args).__dict__)

taskiq/cli/scheduler/run.py

@@ -82,14 +82,16 @@ async def run_scheduler(args: SchedulerArgs) -> None:  # noqa: C901, WPS210, WPS
         exit(1)  # noqa: WPS421
     scheduler.broker.is_scheduler_process = True
     import_tasks(args.modules, args.tasks_pattern, args.fs_discover)
-    basicConfig(
-        level=getLevelName(args.log_level),
-        format=(
-            "[%(asctime)s][%(levelname)-7s]"
-            "[%(module)s:%(funcName)s:%(lineno)d]"
-            " %(message)s"
-        ),
-    )
+    if args.configure_logging:
+        basicConfig(
+            level=getLevelName(args.log_level),
+            format=(
+                "[%(asctime)s][%(levelname)-7s]"
+                "[%(module)s:%(funcName)s:%(lineno)d]"
+                " %(message)s"
+            ),
+        )
+    getLogger("taskiq").setLevel(level=getLevelName(args.log_level))
     for source in scheduler.sources:
         await source.startup()
     loop = asyncio.get_event_loop()