logtail-python 0.4.2__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.2'
+__version__ = '0.4.3'
 
 context = DEFAULT_CONTEXT

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

@@ -95,9 +95,16 @@ class LogtailHandler(logging.Handler):
                 raise e
 
     def flush(self):
-        if self.flush_thread and self.flush_thread.is_alive():
-            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))
+        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,

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: logtail-python
-Version: 0.4.2
+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.2
+Download-URL: https://github.com/logtail/logtail-python/tarball/0.4.3
 Author: Logtail
 Author-email: hello@logtail.com
 License: ISC

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.2.dist-info/RECORD

@@ -1,14 +0,0 @@
-logtail/__init__.py,sha256=4glP1HM13UrMvg1eNN_C4MspQPuKyztVnktGcqsFTuA,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=p7vVYcajZvjH4FJDt4ADLfYljVbQXKTGKk3kFec5JUs,3335
-logtail/handler.py,sha256=Dg4XKhe1bJITz4XBK9JymmNa0cTV6bCcobHeFExlFws,4495
-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.2.dist-info/licenses/LICENSE.md,sha256=aCBMqxfm7QNyFR9JiJ2GSMvhAURXN2E0yTcYNQloqI0,737
-logtail_python-0.4.2.dist-info/METADATA,sha256=km7pAQqucdR1TGjol0bHQyw5qqeqowG-CTFEvafH44Y,2480
-logtail_python-0.4.2.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
-logtail_python-0.4.2.dist-info/top_level.txt,sha256=QZIbQogN1yFBgjiJ-8NlYArVCL00gBoYbEUT_Ew8l-Q,8
-logtail_python-0.4.2.dist-info/RECORD,,