use a fallback 8bit decoding for non-utf8 messages
parent
9ddc8394d4
commit
6a5de578bb
|
@ -18,6 +18,7 @@ def _setPyrusePaths():
|
||||||
PYRUSE_PATHS.insert(0, os.curdir)
|
PYRUSE_PATHS.insert(0, os.curdir)
|
||||||
|
|
||||||
def _doForEachJournalEntry(workflow):
|
def _doForEachJournalEntry(workflow):
|
||||||
|
enc8b = config.Config().asMap().get("8bit-message-encoding", "iso-8859-1")
|
||||||
j = journal.Reader(journal.SYSTEM_ONLY)
|
j = journal.Reader(journal.SYSTEM_ONLY)
|
||||||
j.seek_tail()
|
j.seek_tail()
|
||||||
j.get_previous()
|
j.get_previous()
|
||||||
|
@ -25,6 +26,9 @@ def _doForEachJournalEntry(workflow):
|
||||||
event = j.wait(None)
|
event = j.wait(None)
|
||||||
if event == journal.APPEND:
|
if event == journal.APPEND:
|
||||||
for entry in j:
|
for entry in j:
|
||||||
|
m = entry['MESSAGE']
|
||||||
|
if not isinstance(m, str):
|
||||||
|
entry['MESSAGE'] = m.decode(enc8b)
|
||||||
step = workflow.firstStep
|
step = workflow.firstStep
|
||||||
while step is not None:
|
while step is not None:
|
||||||
step = step.run(entry)
|
step = step.run(entry)
|
||||||
|
|
Loading…
Reference in New Issue