From 1cf9b784fa2fcf943c1fa6082a6ac5067ead8f4c Mon Sep 17 00:00:00 2001
From: Kfir Hadas <sharkykh@gmail.com>
Date: Sat, 3 Jun 2017 10:29:38 +0300
Subject: [PATCH] Fix issue submitter regex and auto log submission (#3822)
---
sickbeard/logger.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sickbeard/logger.py b/sickbeard/logger.py
index cffb014ee..eb4c6b174 100644
--- a/sickbeard/logger.py
+++ b/sickbeard/logger.py
@@ -314,7 +314,7 @@ class Logger(object): # pylint: disable=too-many-instance-attributes
try:
title_error = ss(str(cur_error.title))
if not title_error or title_error == 'None':
- title_error = re.match(r'^[A-Z0-9\-\[\] :]+::\s*(.*)(?: \[[\w]{7}\])$', ss(cur_error.message)).group(1)
+ title_error = re.match(r'^[A-Za-z0-9\-\[\] :]+::\s(?:\[[\w]{7}\])\s*(.*)$', ss(cur_error.message)).group(1)
if len(title_error) > 1000:
title_error = title_error[0:1000]
@@ -324,11 +324,11 @@ class Logger(object): # pylint: disable=too-many-instance-attributes
title_error = 'UNKNOWN'
gist = None
- regex = r'^({0})\s+([A-Z]+)\s+([0-9A-Z\-]+)\s*(.*)(?: \[[\w]{{7}}\])$'.format(cur_error.time)
+ regex = r'^({0})\s+([A-Z]+)\s+[A-Za-z0-9\-\[\] :]+::\s(?:\[[\w]{7}\]).*$'.format(re.escape(cur_error.time))
for i, data in enumerate(__log_data):
match = re.match(regex, data)
if match:
- level = match.group(2)
+ level = match.group(1)
if LOGGING_LEVELS[level] == ERROR:
paste_data = ''.join(__log_data[i:i + 50])
if paste_data:
--
GitLab