From da7270ec91577158f5f77196cd5e3fccb82d741a Mon Sep 17 00:00:00 2001 From: Mika Ayenson Date: Tue, 26 Jul 2022 10:20:36 -0400 Subject: [PATCH] use atexist to logout of kibana cleanly (#2095) (cherry picked from commit e74ad241cada50f1a999afa359eee2c65969123e) --- kibana/connector.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/kibana/connector.py b/kibana/connector.py index 840e7dc69..7f79661cd 100644 --- a/kibana/connector.py +++ b/kibana/connector.py @@ -4,14 +4,15 @@ # 2.0. """Wrapper around requests.Session for HTTP requests to Kibana.""" -import json -import threading +import atexit import base64 +import json import sys +import threading import uuid -from elasticsearch import Elasticsearch import requests +from elasticsearch import Elasticsearch _context = threading.local() @@ -57,8 +58,10 @@ class Kibana(object): self.elasticsearch = elasticsearch if not verify: - from requests.packages.urllib3.exceptions import InsecureRequestWarning + from requests.packages.urllib3.exceptions import \ + InsecureRequestWarning requests.packages.urllib3.disable_warnings(InsecureRequestWarning) + atexit.register(self.__close) @property def version(self): @@ -179,7 +182,7 @@ class Kibana(object): self.session = requests.Session() self.elasticsearch = None - def __del__(self): + def __close(self): if self.authenticated: self.logout()