Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2021-10-02 19:20:58 +02:00
commit 8e382d9383
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
evennia/web/website/views/channels.py
View file

@ -133,8 +133,12 @@ class ChannelDetailView(ChannelMixin, ObjectDetailView):
for log in (x.strip() for x in tail_log_file(filename, 0, self.max_num_lines)):
if not log:
continue
time, msg = log.split(" [-] ")
time_key = time.split(":")[0]
try:
time, msg = log.split(" [-] ")
time_key = time.split(":")[0]
except ValueError:
# malformed log line. Skip.
continue
bucket.append({"key": time_key, "timestamp": time, "message": msg})