summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2025-08-04 20:07:08 -0500
committerJohn Estabrook <jestabro@vyos.io>2025-08-04 21:19:36 -0500
commit497d139a361777dd5e70bd1b4fea2d77c1a59f81 (patch)
treeadc628d6b4740abbbd683c98d354252f80e948e4 /python
parentbf4b08ea2c204a45295d2a34a88e6e4c03cf6328 (diff)
downloadvyos-1x-497d139a361777dd5e70bd1b4fea2d77c1a59f81.tar.gz
vyos-1x-497d139a361777dd5e70bd1b4fea2d77c1a59f81.zip
T7688: owner of vyconf_session calls teardown
Diffstat (limited to 'python')
-rw-r--r--python/vyos/configsource.py7
-rw-r--r--python/vyos/vyconf_session.py4
2 files changed, 7 insertions, 4 deletions
diff --git a/python/vyos/configsource.py b/python/vyos/configsource.py
index 949216722..24a17c711 100644
--- a/python/vyos/configsource.py
+++ b/python/vyos/configsource.py
@@ -354,6 +354,13 @@ class ConfigSourceVyconfSession(ConfigSource):
# cf. T7374
self._level = []
+ def __del__(self):
+ try:
+ if not self._vyconf_session.in_session():
+ self._vyconf_session.teardown()
+ except AttributeError:
+ pass
+
def get_level(self):
return self._level
diff --git a/python/vyos/vyconf_session.py b/python/vyos/vyconf_session.py
index 6de10c468..4b79073ab 100644
--- a/python/vyos/vyconf_session.py
+++ b/python/vyos/vyconf_session.py
@@ -67,10 +67,6 @@ class VyconfSession:
self.on_error = on_error
- def __del__(self):
- if not self.in_config_session:
- self.teardown()
-
def teardown(self):
vyconf_client.send_request('teardown', token=self.__token)