Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bugdown: Extract log_bugdown_error(). 

(It makes it easier to mock out the logging.)
This commit is contained in:
Steve Howell 2016-09-15 12:51:27 -07:00 committed by Tim Abbott
parent c4dd3ba0d3
commit 152cebf33d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/lib/bugdown/__init__.py
View File

@ -1121,6 +1121,14 @@ current_message = None # type: Optional[Message]
# threads themselves, as well. # threads themselves, as well.
db_data = None # type: Dict[text_type, Any] db_data = None # type: Dict[text_type, Any]
def log_bugdown_error(msg):
# type: (str) -> None
"""We use this unusual logging approach to log the bugdown error, in
order to prevent AdminZulipHandler from sending the santized
original markdown formatting into another Zulip message, which
could cause an infinite exception loop."""
logging.getLogger('').error(msg)
def do_convert(md, realm_domain=None, message=None): def do_convert(md, realm_domain=None, message=None):
# type: (markdown.Markdown, Optional[text_type], Optional[Message]) -> Optional[text_type] # type: (markdown.Markdown, Optional[text_type], Optional[Message]) -> Optional[text_type]
"""Convert Markdown to HTML, with Zulip-specific settings and hacks.""" """Convert Markdown to HTML, with Zulip-specific settings and hacks."""
@ -1160,7 +1168,7 @@ def do_convert(md, realm_domain=None, message=None):
cleaned = _sanitize_for_log(md) cleaned = _sanitize_for_log(md)
# Output error to log as well as sending a zulip and email # Output error to log as well as sending a zulip and email
logging.getLogger('').error('Exception in Markdown parser: %sInput (sanitized) was: %s' log_bugdown_error('Exception in Markdown parser: %sInput (sanitized) was: %s'
% (traceback.format_exc(), cleaned)) % (traceback.format_exc(), cleaned))
subject = "Markdown parser failure on %s" % (platform.node(),) subject = "Markdown parser failure on %s" % (platform.node(),)
if settings.ERROR_BOT is not None: if settings.ERROR_BOT is not None: