]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
kres manager: removed left over variables
authorVasek Sraier <git@vakabus.cz>
Sun, 10 Oct 2021 18:53:36 +0000 (20:53 +0200)
committerAleš Mrázek <ales.mrazek@nic.cz>
Fri, 8 Apr 2022 14:17:53 +0000 (16:17 +0200)
manager/knot_resolver_manager/kres_manager.py
manager/knot_resolver_manager/server.py

index b2126244b183c076bd5e41a92be85916266ce365..36ba429507d7351bb33c978247c8f9fddda7cb37 100644 (file)
@@ -32,18 +32,14 @@ class KresManager:
     Instantiate with `KresManager.create()`, not with the usual constructor!
     """
 
-    _instance_lock = asyncio.Lock()
-    _instance: Optional["KresManager"] = None
-
     @staticmethod
-    async def create_instance(selected_controller: Optional[SubprocessController], config: KresConfig) -> "KresManager":
+    async def create(selected_controller: Optional[SubprocessController], config: KresConfig) -> "KresManager":
         """
         Creates new instance of KresManager.
         """
 
         inst = KresManager(config, _i_know_what_i_am_doing=True)
         await inst._async_init(selected_controller, config)  # pylint: disable=protected-access
-        KresManager._instance = inst
         return inst
 
     async def _async_init(self, selected_controller: Optional[SubprocessController], config: KresConfig):
index 0245be42a91ab18a20dda5d1c9c6dee12697045e..03ad96d5cfbd1c874fb9b4cdbc972356d9d1aafb 100644 (file)
@@ -219,7 +219,7 @@ async def _init_manager(config: Union[Path, ParsedTree, _DefaultSentinel]) -> Kr
 
         # Create KresManager. This will perform autodetection of available service managers and
         # select the most appropriate to use (or use the one configured directly)
-        manager = await KresManager.create_instance(controller, config_validated)
+        manager = await KresManager.create(controller, config_validated)
 
         logger.info("Initial configuration applied. Process manager initialized...")
         return manager