From 63e131f2f7358b81830dfa3a1489a30268e4d5a8 Mon Sep 17 00:00:00 2001 From: valentin Date: Wed, 10 Apr 2024 16:41:02 +0200 Subject: [PATCH 1/3] change while True for while not self.stop.is_set() to not keep thread alive while stopping snmp --- pyagentx3/network.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyagentx3/network.py b/pyagentx3/network.py index fe8930f..d98e947 100644 --- a/pyagentx3/network.py +++ b/pyagentx3/network.py @@ -39,7 +39,7 @@ def __init__(self, queue, oid_list, sethandlers, agent_id, socket_path): self.socket = None def _connect(self): - while True: + while not self.stop.is_set(): try: logger.info("Try to open socket on ({})".format(self._socket_path)) self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) @@ -119,7 +119,7 @@ def recv_pdu(self): # ========================================= def _get_updates(self): - while True: + while not self.stop.is_set(): try: item = self._queue.get_nowait() #logger.info('Update: {}'.format(item)) @@ -219,7 +219,7 @@ def _start_network(self): pdu = self.recv_pdu() logger.info("==== Waiting for PDU ====") - while True: + while not self.stop.is_set(): try: self._get_updates() request = self.recv_pdu() From a5dc7ea4978648c5adc11ca5f0a7ff743f8b700e Mon Sep 17 00:00:00 2001 From: valentin Date: Wed, 10 Apr 2024 16:53:22 +0200 Subject: [PATCH 2/3] updater - change while true for while not self.stop.is_set() --- pyagentx3/updater.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pyagentx3/updater.py b/pyagentx3/updater.py index 401995c..b00074f 100644 --- a/pyagentx3/updater.py +++ b/pyagentx3/updater.py @@ -38,9 +38,7 @@ def agent_setup(self, queue, oid, freq): def run(self): start_time = 0 - while True: - if self.stop.is_set(): - break + while self.stop.is_set(): now = time.time() if now - start_time > self._freq: logger.info('Updating : %s (%s)', self.__class__.__name__, self._oid) From 1e8d27dcce1ebf003e68c7959f7fbf3b7a336e2b Mon Sep 17 00:00:00 2001 From: valentin Date: Wed, 10 Apr 2024 16:53:29 +0200 Subject: [PATCH 3/3] updater - change while true for while not self.stop.is_set() --- pyagentx3/updater.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyagentx3/updater.py b/pyagentx3/updater.py index b00074f..c0824d6 100644 --- a/pyagentx3/updater.py +++ b/pyagentx3/updater.py @@ -38,7 +38,7 @@ def agent_setup(self, queue, oid, freq): def run(self): start_time = 0 - while self.stop.is_set(): + while not self.stop.is_set(): now = time.time() if now - start_time > self._freq: logger.info('Updating : %s (%s)', self.__class__.__name__, self._oid)