From 110970f5ed6b456a4eb672b5e5abf4baebf31693 Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Tue, 25 Jun 2024 12:41:50 -0700 Subject: [PATCH] Remove is_monitor --- pymongo/asynchronous/pool.py | 12 ++---------- pymongo/asynchronous/topology.py | 1 - pymongo/synchronous/pool.py | 12 ++---------- pymongo/synchronous/topology.py | 1 - 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/pymongo/asynchronous/pool.py b/pymongo/asynchronous/pool.py index eda2a16428..5a8d9ecdfc 100644 --- a/pymongo/asynchronous/pool.py +++ b/pymongo/asynchronous/pool.py @@ -518,7 +518,6 @@ class PoolOptions: "__server_api", "__load_balanced", "__credentials", - "__is_monitor", ) def __init__( @@ -540,7 +539,6 @@ def __init__( server_api: Optional[ServerApi] = None, load_balanced: Optional[bool] = None, credentials: Optional[MongoCredential] = None, - is_monitor: Optional[bool] = False, ): self.__max_pool_size = max_pool_size self.__min_pool_size = min_pool_size @@ -560,7 +558,6 @@ def __init__( self.__load_balanced = load_balanced self.__credentials = credentials self.__metadata = copy.deepcopy(_METADATA) - self.__is_monitor = is_monitor if appname: self.__metadata["application"] = {"name": appname} @@ -720,11 +717,6 @@ def load_balanced(self) -> Optional[bool]: """True if this Pool is configured in load balanced mode.""" return self.__load_balanced - @property - def is_monitor(self) -> Optional[bool]: - """True if this Pool is owned by a Monitor.""" - return self.__is_monitor - class _CancellationContext: def __init__(self) -> None: @@ -770,7 +762,7 @@ def __init__( self.op_msg_enabled = False self.listeners = pool.opts._event_listeners self.enabled_for_cmap = pool.enabled_for_cmap - self.enabled_for_logging = pool.enabled_for_cmap + self.enabled_for_logging = pool.enabled_for_logging self.compression_settings = pool.opts._compression_settings self.compression_context: Union[SnappyContext, ZlibContext, ZstdContext, None] = None self.socket_checker: SocketChecker = SocketChecker() @@ -1489,7 +1481,7 @@ def __init__( and self.opts._event_listeners is not None and self.opts._event_listeners.enabled_for_cmap ) - self.enabled_for_logging = self.handshake and not self.opts.is_monitor + self.enabled_for_logging = self.handshake # The first portion of the wait queue. # Enforces: maxPoolSize diff --git a/pymongo/asynchronous/topology.py b/pymongo/asynchronous/topology.py index 9cc609830b..ac578113b2 100644 --- a/pymongo/asynchronous/topology.py +++ b/pymongo/asynchronous/topology.py @@ -885,7 +885,6 @@ def _create_pool_for_monitor(self, address: _Address) -> Pool: driver=options.driver, pause_enabled=False, server_api=options.server_api, - is_monitor=True, ) return self._settings.pool_class( diff --git a/pymongo/synchronous/pool.py b/pymongo/synchronous/pool.py index 1940de61d0..076a38ece1 100644 --- a/pymongo/synchronous/pool.py +++ b/pymongo/synchronous/pool.py @@ -518,7 +518,6 @@ class PoolOptions: "__server_api", "__load_balanced", "__credentials", - "__is_monitor", ) def __init__( @@ -540,7 +539,6 @@ def __init__( server_api: Optional[ServerApi] = None, load_balanced: Optional[bool] = None, credentials: Optional[MongoCredential] = None, - is_monitor: Optional[bool] = False, ): self.__max_pool_size = max_pool_size self.__min_pool_size = min_pool_size @@ -560,7 +558,6 @@ def __init__( self.__load_balanced = load_balanced self.__credentials = credentials self.__metadata = copy.deepcopy(_METADATA) - self.__is_monitor = is_monitor if appname: self.__metadata["application"] = {"name": appname} @@ -720,11 +717,6 @@ def load_balanced(self) -> Optional[bool]: """True if this Pool is configured in load balanced mode.""" return self.__load_balanced - @property - def is_monitor(self) -> Optional[bool]: - """True if this Pool is owned by a Monitor.""" - return self.__is_monitor - class _CancellationContext: def __init__(self) -> None: @@ -770,7 +762,7 @@ def __init__( self.op_msg_enabled = False self.listeners = pool.opts._event_listeners self.enabled_for_cmap = pool.enabled_for_cmap - self.enabled_for_logging = pool.enabled_for_cmap + self.enabled_for_logging = pool.enabled_for_logging self.compression_settings = pool.opts._compression_settings self.compression_context: Union[SnappyContext, ZlibContext, ZstdContext, None] = None self.socket_checker: SocketChecker = SocketChecker() @@ -1485,7 +1477,7 @@ def __init__( and self.opts._event_listeners is not None and self.opts._event_listeners.enabled_for_cmap ) - self.enabled_for_logging = self.handshake and not self.opts.is_monitor + self.enabled_for_logging = self.handshake # The first portion of the wait queue. # Enforces: maxPoolSize diff --git a/pymongo/synchronous/topology.py b/pymongo/synchronous/topology.py index 35c6c1cab4..6c8cd88702 100644 --- a/pymongo/synchronous/topology.py +++ b/pymongo/synchronous/topology.py @@ -883,7 +883,6 @@ def _create_pool_for_monitor(self, address: _Address) -> Pool: driver=options.driver, pause_enabled=False, server_api=options.server_api, - is_monitor=True, ) return self._settings.pool_class(