Fixes for line-protocol feature

ynezz · trehn · commit 99cc8caf8e59 · 2015-06-24T21:44:25.000+02:00
Working again with influxdata/influxdb@246ce61 Signed-off-by: Petr Štetiar <ynezz@true.cz>
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -198,7 +198,7 @@ def switch_user(self, username, password):
         self._password = password
 
     def request(self, url, method='GET', params=None, data=None,
-                expected_response_code=200):
+                expected_response_code=200, headers=None):
         """Make a HTTP request to the InfluxDB API.
 
         :param url: the path of the HTTP request, e.g. write, query, etc.
@@ -219,6 +219,9 @@ def request(self, url, method='GET', params=None, data=None,
         """
         url = "{0}/{1}".format(self._baseurl, url)
 
+        if headers is None:
+            headers = self._headers
+
         if params is None:
             params = {}
 
@@ -235,7 +238,7 @@ def request(self, url, method='GET', params=None, data=None,
                     auth=(self._username, self._password),
                     params=params,
                     data=data,
-                    headers=self._headers,
+                    headers=headers,
                     verify=self._verify_ssl,
                     timeout=self._timeout
                 )
@@ -264,12 +267,17 @@ def write(self, data, params=None, expected_response_code=204):
         :returns: True, if the write operation is successful
         :rtype: bool
         """
+
+        headers = self._headers
+        headers['Content-type'] = 'application/octet-stream'
+
         self.request(
-            url="write_points",
+            url="write",
             method='POST',
             params=params,
             data=make_lines(data).encode('utf-8'),
-            expected_response_code=expected_response_code
+            expected_response_code=expected_response_code,
+            headers=headers
         )
         return True
 
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -139,7 +139,7 @@ def test_write(self):
         with requests_mock.Mocker() as m:
             m.register_uri(
                 requests_mock.POST,
-                "http://localhost:8086/write_points",
+                "http://localhost:8086/write",
                 status_code=204
             )
             cli = InfluxDBClient(database='db')
@@ -162,7 +162,7 @@ def test_write_points(self):
         with requests_mock.Mocker() as m:
             m.register_uri(
                 requests_mock.POST,
-                "http://localhost:8086/write_points",
+                "http://localhost:8086/write",
                 status_code=204
             )
 
@@ -182,7 +182,7 @@ def test_write_points_toplevel_attributes(self):
         with requests_mock.Mocker() as m:
             m.register_uri(
                 requests_mock.POST,
-                "http://localhost:8086/write_points",
+                "http://localhost:8086/write",
                 status_code=204
             )
 
@@ -221,7 +221,7 @@ def test_write_points_batch(self):
                                           "fields": {"value": 12.00}}]}
         with requests_mock.Mocker() as m:
             m.register_uri(requests_mock.POST,
-                           "http://localhost:8086/write_points",
+                           "http://localhost:8086/write",
                            status_code=204)
             cli = InfluxDBClient(database='db')
             cli.write_points(points=dummy_points,
@@ -278,7 +278,7 @@ def test_write_points_with_precision(self):
         with requests_mock.Mocker() as m:
             m.register_uri(
                 requests_mock.POST,
-                "http://localhost:8086/write_points",
+                "http://localhost:8086/write",
                 status_code=204
             )
 
