paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

highlight_html_differences: Improve logging output.

Browse Source 
Now at least it will give the message ID, and thus be possible to
debug.
This commit is contained in:
Tim Abbott
2017-10-11 23:38:02 -07:00
parent 065033e864
commit 339e206c90
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/lib/html_diff.py
View File

@@ -88,8 +88,8 @@ def check_tags(text):
break
return text
def highlight_html_differences(s1, s2):
# type: (Text, Text) -> Text
def highlight_html_differences(s1, s2, msg_id=None):
# type: (Text, Text, Optional[int]) -> Text
differ = diff_match_patch()
ops = differ.diff_main(s1, s2)
differ.diff_cleanupSemantic(ops)
@@ -122,14 +122,17 @@ def highlight_html_differences(s1, s2):
if not verify_html(retval):
from zerver.lib.actions import internal_send_message
from zerver.models import get_system_bot
# We probably want more information here
logging.getLogger('').error('HTML diff produced mal-formed HTML')
# Normally, one would just throw a JsonableError, but because
# we don't super trust this algorithm, it makes sense to
# mostly report the error to the Zulip developers to debug.
logging.getLogger('').error('HTML diff produced mal-formed HTML for message %s' % (msg_id,))
if settings.ERROR_BOT is not None:
subject = "HTML diff failure on %s" % (platform.node(),)
realm = get_system_bot(settings.ERROR_BOT).realm
internal_send_message(realm, settings.ERROR_BOT, "stream",
"errors", subject, "HTML diff produced malformed HTML")
"errors", subject, "HTML diff produced malformed HTML for message %s" % (msg_id,))
return s2
return retval