From b81d252cfed22d5d0fb28745a2c55ad717b447f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Fri, 26 Apr 2024 18:06:47 +0200
Subject: [PATCH] LaBrea: Open log with safe encoding - avoid bytes -> str
errors
---
hp-labrea/labrea-idea.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hp-labrea/labrea-idea.py b/hp-labrea/labrea-idea.py
index 2e030f9..dd0b0c0 100755
--- a/hp-labrea/labrea-idea.py
+++ b/hp-labrea/labrea-idea.py
@@ -8,6 +8,7 @@ import time
import optparse
import signal
import uuid
+import codecs
import json
import socket
import resource
@@ -210,7 +211,7 @@ class FileWatcher(object):
def open(self):
try:
- self.f = open(self.filename, "r")
+ self.f = codecs.open(self.filename, "r", encoding="ISO-8859-1")
st = os.fstat(self.f.fileno())
self.inode, self.size = st.st_ino, st.st_size
except IOError:
@@ -662,7 +663,7 @@ def main():
if opts.oneshot:
signal.signal(signal.SIGINT, terminate_me)
signal.signal(signal.SIGTERM, terminate_me)
- files = [open(arg) for arg in args]
+ files = [codecs.open(arg, "r", encoding="ISO-8859-1") for arg in args]
else:
daemonize(
pidfile=opts.pid,
--
GitLab