diff options
author | liu lei <leolovenet@gmail.com> | 2016-10-19 14:24:52 +0800 |
---|---|---|
committer | liu lei <leolovenet@gmail.com> | 2016-10-19 14:24:52 +0800 |
commit | c335489138f329e4dbcda92b0957b45c201d1b29 (patch) | |
tree | c05594b189f1fc66b61b7af04c85236282437d62 /python.d/python_modules/base.py | |
parent | c9e318603b7cbfa65203d38431f43c5375f0118c (diff) |
1. changed arguments from decode() in base.py to support versions of Python 2.6
2. added pass parameters to redis for AUTH command
3. optimized nginx.chart.py and phpfpm.chart.py submenu name
4. optimized phpfpm.chart.py average display
Diffstat (limited to 'python.d/python_modules/base.py')
-rw-r--r-- | python.d/python_modules/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py index 70c586f8e4..aecba8ea18 100644 --- a/python.d/python_modules/base.py +++ b/python.d/python_modules/base.py @@ -458,7 +458,7 @@ class UrlService(SimpleService): return None try: - raw = f.read().decode('utf-8') + raw = f.read().decode('utf-8', 'ignore') except Exception as e: self.error(str(e)) finally: @@ -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(errors='ignore') + data += buf.decode('utf-8', 'ignore') if self._check_raw_data(data): break else: |