logtail-python 0.4.1__py2.py3-none-any.whl → 0.4.3__py2.py3-none-any.whl

logtail/__init__.py

@@ -5,6 +5,6 @@ from .handler import LogtailHandler
 from .helpers import LogtailContext, DEFAULT_CONTEXT
 from .formatter import LogtailFormatter
 
-__version__ = '0.4.1'
+__version__ = '0.4.3'
 
 context = DEFAULT_CONTEXT

logtail/flusher.py

@@ -100,11 +100,30 @@ class FlushWorker(threading.Thread):
         if shutdown and self.pipe.empty():
             self.should_run = False
 
-    def flush(self):
+    def flush(self, timeout=None):
+        """Block until the worker has drained the queue.
+
+        If ``timeout`` is given (in seconds), return after at most that much
+        wall time has elapsed even if the queue is still non-empty. Returns
+        ``True`` if the queue was drained, ``False`` if the timeout fired.
+
+        The bound matters when the caller holds the global logging lock, as
+        ``logging.config.dictConfig()`` does while it flushes and closes the
+        handlers it replaces: if this worker is inside an upload whose urllib3
+        ``debug()`` call needs that same lock, an unbounded wait deadlocks the
+        process. It also keeps a slow or unreachable endpoint from stalling a
+        shutdown forever.
+        """
         self._flushing = True
-        while not self._clean or not self.pipe.empty():
-            time.sleep(self.check_interval)
-        self._flushing = False
+        try:
+            deadline = None if timeout is None else time.time() + timeout
+            while not self._clean or not self.pipe.empty():
+                if deadline is not None and time.time() >= deadline:
+                    return False
+                time.sleep(self.check_interval)
+            return True
+        finally:
+            self._flushing = False
 
 def in_flush_worker():
     return isinstance(threading.current_thread(), FlushWorker)

logtail/frame.py

@@ -93,4 +93,9 @@ def _relative_to_main_module_if_possible(pathname):
     return _relative_to_main_module(pathname) if has_main_module else pathname
 
 def _relative_to_main_module(pathname):
-    return path.relpath(pathname, path.dirname(__main__.__file__))
+    try:
+        return path.relpath(pathname, path.dirname(__main__.__file__))
+    except ValueError:
+        # Windows has no relative path between drives, and a PyInstaller build unpacks the
+        # script to the system drive while the application may run from another one.
+        return pathname

logtail/handler.py

@@ -19,6 +19,8 @@ DEFAULT_RAISE_EXCEPTIONS = False
 DEFAULT_DROP_EXTRA_EVENTS = True
 DEFAULT_INCLUDE_EXTRA_ATTRIBUTES = True
 DEFAULT_TIMEOUT = 30
+DEFAULT_FLUSH_TIMEOUT = 30
+
 
 _handlers = weakref.WeakSet()
 
@@ -35,6 +37,7 @@ class LogtailHandler(logging.Handler):
                  include_extra_attributes=DEFAULT_INCLUDE_EXTRA_ATTRIBUTES,
                  context=DEFAULT_CONTEXT,
                  timeout=DEFAULT_TIMEOUT,
+                 flush_timeout=DEFAULT_FLUSH_TIMEOUT,
                  level=logging.NOTSET):
         super(LogtailHandler, self).__init__(level=level)
         self.source_token = source_token
@@ -51,6 +54,7 @@ class LogtailHandler(logging.Handler):
         self.flush_interval = flush_interval
         self.check_interval = check_interval
         self.raise_exceptions = raise_exceptions
+        self.flush_timeout = flush_timeout
         self.dropcount = 0
         # Do not initialize the flush thread yet because it causes issues on Render.
         self.flush_thread = None
@@ -91,8 +95,16 @@ class LogtailHandler(logging.Handler):
                 raise e
 
     def flush(self):
-        if self.flush_thread and self.flush_thread.is_alive():
-             self.flush_thread.flush()
+        if not (self.flush_thread and self.flush_thread.is_alive()):
+            return
+        if logging._lock._is_owned():
+            # logging.config.dictConfig() flushes the handlers it replaces while holding the global
+            # logging lock, and the worker's upload needs that lock whenever urllib3's logger has a
+            # level-cache miss, so waiting here could only deadlock. Nothing is lost: the worker
+            # keeps running and sends what is queued as soon as the lock is released.
+            return
+        if not self.flush_thread.flush(timeout=self.flush_timeout):
+            print('Gave up waiting for Better Stack uploads after {}s, logs are still buffered'.format(self.flush_timeout))
 
     def _reset_after_fork(self):
         # A forked child inherits the parent's queue with whatever was still buffered in it,
@@ -100,7 +112,7 @@ class LogtailHandler(logging.Handler):
         # whose socket it shares with the parent, so it starts over with fresh ones.
         self.pipe = queue.Queue(maxsize=self.buffer_capacity)
         self.flush_thread = None
-        self.uploader = Uploader(self.source_token, self.host, self.uploader.timeout)
+        self.uploader.reset()
 
 
 def _reset_handlers_after_fork():

logtail/uploader.py

@@ -1,7 +1,9 @@
 # coding: utf-8
 from __future__ import print_function, unicode_literals
+import os
 import msgpack
 import requests
+import requests.utils
 
 class Fake500(object):
     def __init__(self, exception):
@@ -13,11 +15,17 @@ class Uploader(object):
         self.source_token = source_token
         self.host = host
         self.timeout = timeout
-        self.session = requests.Session()
+        # requests would otherwise ask the environment, and on macOS SystemConfiguration, for
+        # proxy settings on every request. Resolving them once here keeps the flush thread out
+        # of CoreFoundation, which refuses to run in a child forked from a multithreaded
+        # process, such as an RQ work horse. The CA bundle variables follow the same rule.
+        self.proxies = requests.utils.get_environ_proxies(host)
+        self.verify = os.environ.get('REQUESTS_CA_BUNDLE') or os.environ.get('CURL_CA_BUNDLE') or True
         self.headers = {
             'Authorization': 'Bearer %s' % source_token,
             'Content-Type': 'application/msgpack',
         }
+        self.session = self._new_session()
 
     def __call__(self, frame):
         data = msgpack.packb(frame, use_bin_type=True)
@@ -25,3 +33,15 @@ class Uploader(object):
             return self.session.post(self.host, data=data, headers=self.headers, timeout=self.timeout)
         except requests.RequestException as e:
             return Fake500(e)
+
+    def reset(self):
+        # A forked child shares the parent's pooled socket, so it needs a session of its own,
+        # built from the settings resolved above rather than looked up again.
+        self.session = self._new_session()
+
+    def _new_session(self):
+        session = requests.Session()
+        session.trust_env = False
+        session.proxies = self.proxies
+        session.verify = self.verify
+        return session

{logtail_python-0.4.1.dist-info → logtail_python-0.4.3.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: logtail-python
-Version: 0.4.1
+Version: 0.4.3
 Summary: Better Stack client library
 Home-page: https://github.com/logtail/logtail-python
-Download-URL: https://github.com/logtail/logtail-python/tarball/0.4.1
+Download-URL: https://github.com/logtail/logtail-python/tarball/0.4.3
 Author: Logtail
 Author-email: hello@logtail.com
 License: ISC
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10

logtail_python-0.4.3.dist-info/RECORD

@@ -0,0 +1,14 @@
+logtail/__init__.py,sha256=s4LOmVNtxWLWS5XoL0bE-d7v8zZAqP_d-xh77sTZ_z8,252
+logtail/compat.py,sha256=KbZmcmDpj_vbMotp16pADPwJ1FkEHGDNjKbOfCy-c10,141
+logtail/flusher.py,sha256=bPSCvKNniXBZWYY5AVZ0w6lFkxswe739Ooa3ZAj608s,5987
+logtail/formatter.py,sha256=nk4W1G95P19ijylPBJ8D9FlO_qbh3tfbv7xzCSfpDN8,968
+logtail/frame.py,sha256=Vmh6UZWz86i16faH1fYqeCS6UUy7-29-XHDgMPwGfB0,3571
+logtail/handler.py,sha256=Cuz8QmFGzBVTpMb6DZZV6VEmJ9smlM3RaqTTBei3GXY,4952
+logtail/helpers.py,sha256=ezDTLsTBAtCtIh_XptSYOiBrZFa-E9wo2SWTnjKgOOU,1156
+logtail/rq.py,sha256=SEjVwjp8lRLab2F0StdssBQ0-vFK1CekEgYwkSICBeo,1023
+logtail/uploader.py,sha256=5oeNxmnyogq1w9MoK2YkxQGxQy_bJ-yS7RqWzltQrKY,1873
+logtail_python-0.4.3.dist-info/licenses/LICENSE.md,sha256=aCBMqxfm7QNyFR9JiJ2GSMvhAURXN2E0yTcYNQloqI0,737
+logtail_python-0.4.3.dist-info/METADATA,sha256=ry2U2ZRaMnPu10JiI7AaSjB2BSu5K-45Q7QfVe4UBTM,2480
+logtail_python-0.4.3.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
+logtail_python-0.4.3.dist-info/top_level.txt,sha256=QZIbQogN1yFBgjiJ-8NlYArVCL00gBoYbEUT_Ew8l-Q,8
+logtail_python-0.4.3.dist-info/RECORD,,

logtail_python-0.4.1.dist-info/RECORD

@@ -1,14 +0,0 @@
-logtail/__init__.py,sha256=9PQmXLJchEiOwtJ6WfZuo9AT1aL3rl6ZPD7TxLKwuz0,252
-logtail/compat.py,sha256=KbZmcmDpj_vbMotp16pADPwJ1FkEHGDNjKbOfCy-c10,141
-logtail/flusher.py,sha256=EjLbAgooBjYs0KKCMVqxRddDpMD8qnVuhXSEMZTISQw,5017
-logtail/formatter.py,sha256=nk4W1G95P19ijylPBJ8D9FlO_qbh3tfbv7xzCSfpDN8,968
-logtail/frame.py,sha256=p7vVYcajZvjH4FJDt4ADLfYljVbQXKTGKk3kFec5JUs,3335
-logtail/handler.py,sha256=CruppN_XD0W-Ifsl1iu99T0yWw66utkl7_un6V6OO1Y,4265
-logtail/helpers.py,sha256=ezDTLsTBAtCtIh_XptSYOiBrZFa-E9wo2SWTnjKgOOU,1156
-logtail/rq.py,sha256=SEjVwjp8lRLab2F0StdssBQ0-vFK1CekEgYwkSICBeo,1023
-logtail/uploader.py,sha256=Ilhh8wuAGlz1YJcQpzXtFqwD-2RYmuamKv3dFNoTWUg,868
-logtail_python-0.4.1.dist-info/licenses/LICENSE.md,sha256=aCBMqxfm7QNyFR9JiJ2GSMvhAURXN2E0yTcYNQloqI0,737
-logtail_python-0.4.1.dist-info/METADATA,sha256=F29t1-2304x3Ofa8b1cASyECF4V85ef2Ndo5yovJzmI,2429
-logtail_python-0.4.1.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
-logtail_python-0.4.1.dist-info/top_level.txt,sha256=QZIbQogN1yFBgjiJ-8NlYArVCL00gBoYbEUT_Ew8l-Q,8
-logtail_python-0.4.1.dist-info/RECORD,,