logtail-python 0.3.2__tar.gz → 0.3.4__tar.gz

{logtail_python-0.3.2/logtail_python.egg-info → logtail_python-0.3.4}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: logtail-python
-Version: 0.3.2
+Version: 0.3.4
 Summary: Logtail.com client library
 Home-page: https://github.com/logtail/logtail-python
-Download-URL: https://github.com/logtail/logtail-python/tarball/0.3.2
+Download-URL: https://github.com/logtail/logtail-python/tarball/0.3.4
 Author: Logtail
 Author-email: hello@logtail.com
 License: ISC
@@ -23,6 +23,18 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: requests>=2.18.4
 Requires-Dist: msgpack>=0.5.6
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # [Better Stack](https://betterstack.com/logs) Python client
 

{logtail_python-0.3.2 → logtail_python-0.3.4}/logtail/__init__.py

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

{logtail_python-0.3.2 → logtail_python-0.3.4}/logtail/handler.py

@@ -9,13 +9,14 @@ from .flusher import FlushWorker
 from .uploader import Uploader
 from .frame import create_frame
 
-DEFAULT_HOST = 'https://in.logs.betterstack.com'
+DEFAULT_HOST = 'in.logs.betterstack.com'
 DEFAULT_BUFFER_CAPACITY = 1000
 DEFAULT_FLUSH_INTERVAL = 1
 DEFAULT_CHECK_INTERVAL = 0.1
 DEFAULT_RAISE_EXCEPTIONS = False
 DEFAULT_DROP_EXTRA_EVENTS = True
 DEFAULT_INCLUDE_EXTRA_ATTRIBUTES = True
+DEFAULT_TIMEOUT = 30
 
 
 class LogtailHandler(logging.Handler):
@@ -29,13 +30,17 @@ class LogtailHandler(logging.Handler):
                  drop_extra_events=DEFAULT_DROP_EXTRA_EVENTS,
                  include_extra_attributes=DEFAULT_INCLUDE_EXTRA_ATTRIBUTES,
                  context=DEFAULT_CONTEXT,
+                 timeout=DEFAULT_TIMEOUT,
                  level=logging.NOTSET):
         super(LogtailHandler, self).__init__(level=level)
         self.source_token = source_token
-        self.host = host
+        if host.startswith('https://') or host.startswith('http://'):
+            self.host = host
+        else:
+            self.host = "https://" + host
         self.context = context
         self.pipe = queue.Queue(maxsize=buffer_capacity)
-        self.uploader = Uploader(self.source_token, self.host)
+        self.uploader = Uploader(self.source_token, self.host, timeout)
         self.drop_extra_events = drop_extra_events
         self.include_extra_attributes = include_extra_attributes
         self.buffer_capacity = buffer_capacity

{logtail_python-0.3.2 → logtail_python-0.3.4}/logtail/uploader.py

@@ -9,9 +9,10 @@ class Fake500(object):
         self.exception = exception
 
 class Uploader(object):
-    def __init__(self, source_token, host):
+    def __init__(self, source_token, host, timeout):
         self.source_token = source_token
         self.host = host
+        self.timeout = timeout
         self.session = requests.Session()
         self.headers = {
             'Authorization': 'Bearer %s' % source_token,
@@ -21,6 +22,6 @@ class Uploader(object):
     def __call__(self, frame):
         data = msgpack.packb(frame, use_bin_type=True)
         try:
-            return self.session.post(self.host, data=data, headers=self.headers)
+            return self.session.post(self.host, data=data, headers=self.headers, timeout=self.timeout)
         except requests.RequestException as e:
-            return Fake500(e)
+            return Fake500(e)

{logtail_python-0.3.2 → logtail_python-0.3.4/logtail_python.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: logtail-python
-Version: 0.3.2
+Version: 0.3.4
 Summary: Logtail.com client library
 Home-page: https://github.com/logtail/logtail-python
-Download-URL: https://github.com/logtail/logtail-python/tarball/0.3.2
+Download-URL: https://github.com/logtail/logtail-python/tarball/0.3.4
 Author: Logtail
 Author-email: hello@logtail.com
 License: ISC
@@ -23,6 +23,18 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: requests>=2.18.4
 Requires-Dist: msgpack>=0.5.6
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # [Better Stack](https://betterstack.com/logs) Python client
 

{logtail_python-0.3.2 → logtail_python-0.3.4}/setup.py

@@ -3,7 +3,7 @@ import os
 from setuptools import setup
 
 
-VERSION = '0.3.2'
+VERSION = '0.3.4'
 ROOT_DIR = os.path.dirname(__file__)
 
 REQUIREMENTS = [

{logtail_python-0.3.2 → logtail_python-0.3.4}/tests/test_flusher.py

@@ -20,10 +20,11 @@ class TestFlushWorker(unittest.TestCase):
     buffer_capacity = 5
     flush_interval = 2
     check_interval = 0.01
+    timeout = 0.1
 
     def _setup_worker(self, uploader=None):
         pipe = queue.Queue(maxsize=self.buffer_capacity)
-        uploader = uploader or Uploader(self.source_token, self.host)
+        uploader = uploader or Uploader(self.source_token, self.host, self.timeout)
         fw = FlushWorker(uploader, pipe, self.buffer_capacity, self.flush_interval, self.check_interval)
         return pipe, uploader, fw
 

{logtail_python-0.3.2 → logtail_python-0.3.4}/tests/test_handler.py

@@ -19,7 +19,17 @@ class TestLogtailHandler(unittest.TestCase):
     def test_handler_creates_uploader_from_args(self, MockWorker):
         handler = LogtailHandler(source_token=self.source_token, host=self.host)
         self.assertEqual(handler.uploader.source_token, self.source_token)
-        self.assertEqual(handler.uploader.host, self.host)
+        self.assertEqual(handler.uploader.host, "https://" + self.host)
+        
+    @patch('logtail.handler.FlushWorker')
+    def test_handler_passes_timeout_to_uploader(self, MockWorker):
+        # Test default timeout
+        handler = LogtailHandler(source_token=self.source_token, host=self.host)
+        self.assertEqual(handler.uploader.timeout, 30)
+        
+        # Test custom timeout
+        handler = LogtailHandler(source_token=self.source_token, host=self.host, timeout=10)
+        self.assertEqual(handler.uploader.timeout, 10)
 
     @patch('logtail.handler.FlushWorker')
     def test_handler_creates_pipe_from_args(self, MockWorker):

{logtail_python-0.3.2 → logtail_python-0.3.4}/tests/test_uploader.py

@@ -13,10 +13,11 @@ class TestUploader(unittest.TestCase):
     host = 'https://in.logtail.com'
     source_token = 'dummy_source_token'
     frame = [1, 2, 3]
+    timeout = 30
 
     @patch('logtail.uploader.requests.Session.post')
     def test_call(self, post):
-        def mock_post(endpoint, data=None, headers=None):
+        def mock_post(endpoint, data=None, headers=None, timeout=None):
             # Check that the data is sent to ther correct endpoint
             self.assertEqual(endpoint, self.host)
             # Check the content-type
@@ -25,9 +26,11 @@ class TestUploader(unittest.TestCase):
             self.assertEqual('application/msgpack', headers.get('Content-Type'))
             # Check the content was msgpacked correctly
             self.assertEqual(msgpack.unpackb(data, raw=False), self.frame)
+            # Check that timeout is passed to the request
+            self.assertEqual(timeout, 30)
 
         post.side_effect = mock_post
-        u = Uploader(self.source_token, self.host)
+        u = Uploader(self.source_token, self.host, self.timeout)
         u(self.frame)
 
         self.assertTrue(post.called)