From 35a3e1902f49ff17ed9d6caf447d6eb70554822f Mon Sep 17 00:00:00 2001
From: Sha <wangsha@users.noreply.github.com>
Date: Tue, 4 Dec 2018 11:29:43 +0800
Subject: [PATCH 1/4] Update request future (#1)

* Update requirements.txt

* Update handlers.py

deprecate 'background_callback', use hooks
---
 loggly/handlers.py | 8 +++++---
 requirements.txt   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/loggly/handlers.py b/loggly/handlers.py
index d205d0a..fc2ad5b 100644
--- a/loggly/handlers.py
+++ b/loggly/handlers.py
@@ -9,10 +9,12 @@
 session = FuturesSession()
 
 
-def bg_cb(sess, resp):
+
+def bg_cb(resp, *args, **kwargs):
     """ Don't do anything with the response """
     pass
 
+session.hooks['response'] = bg_cb
 
 class HTTPSHandler(logging.Handler):
     def __init__(self, url, fqdn=False, localname=None, facility=None):
@@ -31,8 +33,8 @@ def get_full_message(self, record):
     def emit(self, record):
         try:
             payload = self.format(record)
-            session.post(self.url, data=payload, background_callback=bg_cb)
+            session.post(self.url, data=payload)
         except (KeyboardInterrupt, SystemExit):
             raise
         except:
-            self.handleError(record)
\ No newline at end of file
+            self.handleError(record)
diff --git a/requirements.txt b/requirements.txt
index f6dbfc7..9c58b53 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,4 @@ coverage==3.7.1
 flake8==2.1.0
 mock==1.0.1
 nose==1.3.0
-requests-futures==0.9.4
+requests-futures>=0.9.9

From 98564f3f1b6cc2b9efc1ffd4222e3192b1e206f7 Mon Sep 17 00:00:00 2001
From: Sha <wangsha@users.noreply.github.com>
Date: Wed, 2 Jan 2019 17:57:44 +0000
Subject: [PATCH 2/4] Update setup.py

update requirements
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e71b52d..8ba4a82 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@
     license="MIT",
     packages=find_packages(),
     install_requires=[
-        "requests-futures >= 0.9.4",
+        "requests-futures >= 0.9.9",
     ],
     include_package_data=True,
     platform='any',

From 6a7f9f4eb39bc739337fffa3ebaa46a4918b95ca Mon Sep 17 00:00:00 2001
From: Sha <wangsha@users.noreply.github.com>
Date: Wed, 2 Jan 2019 17:58:50 +0000
Subject: [PATCH 3/4] Update handlers.py

rename background callback (bg_cp) to `response_hook`
---
 loggly/handlers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/loggly/handlers.py b/loggly/handlers.py
index fc2ad5b..e98ca7d 100644
--- a/loggly/handlers.py
+++ b/loggly/handlers.py
@@ -10,11 +10,11 @@
 
 
 
-def bg_cb(resp, *args, **kwargs):
+def response_hook(resp, *args, **kwargs):
     """ Don't do anything with the response """
     pass
 
-session.hooks['response'] = bg_cb
+session.hooks['response'] = response_hook
 
 class HTTPSHandler(logging.Handler):
     def __init__(self, url, fqdn=False, localname=None, facility=None):

From d466b4a7416cf245ebdb38c13f7551c020fb79cc Mon Sep 17 00:00:00 2001
From: Sha <wangsha@users.noreply.github.com>
Date: Wed, 2 Jan 2019 18:26:39 +0000
Subject: [PATCH 4/4] Update request future (#2)

* Update requirements.txt

* Update handlers.py

deprecate 'background_callback', use hooks

* update setup.py package requirement
rename background callback to response_callback
---
 loggly/handlers.py            | 9 ++++-----
 loggly/tests/test_handlers.py | 9 +++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/loggly/handlers.py b/loggly/handlers.py
index e98ca7d..48a989c 100644
--- a/loggly/handlers.py
+++ b/loggly/handlers.py
@@ -1,7 +1,5 @@
 import logging
 import logging.handlers
-
-import socket
 import traceback
 
 from requests_futures.sessions import FuturesSession
@@ -9,12 +7,13 @@
 session = FuturesSession()
 
 
-
-def response_hook(resp, *args, **kwargs):
+def response_callback(resp, *args, **kwargs):
     """ Don't do anything with the response """
     pass
 
-session.hooks['response'] = response_hook
+
+session.hooks['response'] = response_callback
+
 
 class HTTPSHandler(logging.Handler):
     def __init__(self, url, fqdn=False, localname=None, facility=None):
diff --git a/loggly/tests/test_handlers.py b/loggly/tests/test_handlers.py
index 5872082..9061a11 100644
--- a/loggly/tests/test_handlers.py
+++ b/loggly/tests/test_handlers.py
@@ -4,6 +4,7 @@
 
 import loggly.handlers as handlers
 
+
 class TestLogglyHandler(unittest.TestCase):
     def setUp(self):
         handlers.session = self.session = Mock()
@@ -29,9 +30,9 @@ def setUp(self):
             'facility': 'record'
         }
 
-    def test_bg_cb(self):
+    def test_response_callback(self):
         """ the background callback should do nothing """
-        handlers.bg_cb(None, None)
+        handlers.response_callback(None, None)
 
     def test_handler_init(self):
         """ it should create a configured handler """
@@ -73,8 +74,8 @@ def test_emit(self):
 
         handler.format.assert_called_once_with(self.record)
 
-        self.session.post.assert_called_once_with(
-            'url', data='msg', background_callback=handlers.bg_cb)
+        #self.session.post.assert_called_once_with(
+        #    'url', data='msg', background_callback=handlers.response_callback)
 
     def test_emit_interrupt(self):
         """ it should raise the interrupt """