github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #723 from kwirk/decode-warning 

ENH: Clearer warning with lines which failed to decode correctly
pull/739/head
Yaroslav Halchenko 2014-05-30 12:15:51 -04:00
parent fc4b69a282 0ca97431a0
commit 98daa9d301
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fail2ban/server/filter.py
View File

@ -790,8 +790,10 @@ class FileContainer:
try: try:
line = line.decode(self.getEncoding(), 'strict') line = line.decode(self.getEncoding(), 'strict')
except UnicodeDecodeError: except UnicodeDecodeError:
logSys.warning("Error decoding line from '%s' with '%s': %s" % logSys.warning(
(self.getFileName(), self.getEncoding(), `line`)) "Error decoding line from '%s' with '%s'. Continuing "
" to process line ignoring invalid characters: %r" %
(self.getFileName(), self.getEncoding(), line))
if sys.version_info >= (3,): # In python3, must be decoded if sys.version_info >= (3,): # In python3, must be decoded
line = line.decode(self.getEncoding(), 'ignore') line = line.decode(self.getEncoding(), 'ignore')
return line return line