Merge pull request #1094 from ktsaou/master

updated readme

diff --git a/conf.d/health_alarm_notify.conf b/conf.d/health_alarm_notify.conf
index d451cafedcf15919de29ed5a620b496c94611b6e..49026e3161f73e731d6a0490486106083044df45 100644 (file)
--- a/conf.d/health_alarm_notify.conf
+++ b/conf.d/health_alarm_notify.conf
@@ -119,7 +119,7 @@ DEFAULT_RECIPIENT_PUSHOVER=""
 # Users also need to open a query with the bot (see below).
 
 # note: multiple recipients can be given like this:
-#                  "CHAT_ID_1 CHAT_ID_1 ..."
+#                  "CHAT_ID_1 CHAT_ID_2 ..."
 
 # enable/disable sending telegram messages
 SEND_TELEGRAM="YES"

diff --git a/conf.d/python.d/redis.conf b/conf.d/python.d/redis.conf
index 9935bff77f6d366e9f8be7f07b3a998e48df0043..e1ce2de2e649a8e7ba36db2eedca45e548416341 100644 (file)
--- a/conf.d/python.d/redis.conf
+++ b/conf.d/python.d/redis.conf
@@ -56,7 +56,7 @@
 #
 # Additionally to the above, redis also supports the following:
 #
-#     socket: 'path/to/mysql.sock'
+#     socket: 'path/to/redis.sock'
 #
 #  or
 #     host: 'IP or HOSTNAME' # the host to connect to

diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py
index 1508e0965e58b8ca184400ebbc584b157c0d7c99..70c586f8e411a276b829406cddc75cbcf8a4b7cf 100644 (file)
--- a/python.d/python_modules/base.py
+++ b/python.d/python_modules/base.py
@@ -608,7 +608,7 @@ class SocketService(SimpleService):
                 buf = self._sock.recv(4096)
                 if len(buf) == 0 or buf is None:  # handle server disconnect
                     break
-                data += buf.decode()
+                data += buf.decode(errors='ignore')
                 if self._check_raw_data(data):
                     break
             else: