Commit e57001e1 authored by Stefan H. Holek's avatar Stefan H. Holek

SiteErrorLog only copied the unformatted traceback to the event.log,

missing out on __traceback_supplement__.
parent a362d536
...@@ -37,6 +37,9 @@ Zope Changes ...@@ -37,6 +37,9 @@ Zope Changes
- OFS.PropertyManager: Provided missing security declarations. - OFS.PropertyManager: Provided missing security declarations.
- Products.SiteErrorLog: SiteErrorLog only copied the unformatted
traceback to the event.log, missing out on __traceback_supplement__.
Zope 2.9.2 (2006/03/27) Zope 2.9.2 (2006/03/27)
Bugs fixed Bugs fixed
......
...@@ -213,18 +213,18 @@ class SiteErrorLog (SimpleItem): ...@@ -213,18 +213,18 @@ class SiteErrorLog (SimpleItem):
LOG.error('Error while logging', exc_info=sys.exc_info()) LOG.error('Error while logging', exc_info=sys.exc_info())
else: else:
if self.copy_to_zlog: if self.copy_to_zlog:
self._do_copy_to_zlog(now,strtype,str(url),info) self._do_copy_to_zlog(now,strtype,str(url),tb_text)
return '%s/showEntry?id=%s' % (self.absolute_url(), entry_id) return '%s/showEntry?id=%s' % (self.absolute_url(), entry_id)
finally: finally:
info = None info = None
def _do_copy_to_zlog(self,now,strtype,url,info): def _do_copy_to_zlog(self,now,strtype,url,tb_text):
when = _rate_restrict_pool.get(strtype,0) when = _rate_restrict_pool.get(strtype,0)
if now>when: if now>when:
next_when = max(when, now-_rate_restrict_burst*_rate_restrict_period) next_when = max(when, now-_rate_restrict_burst*_rate_restrict_period)
next_when += _rate_restrict_period next_when += _rate_restrict_period
_rate_restrict_pool[strtype] = next_when _rate_restrict_pool[strtype] = next_when
LOG.error(str(url), exc_info=info) LOG.error('%s\n%s' % (url, tb_text.rstrip()))
security.declareProtected(use_error_logging, 'getProperties') security.declareProtected(use_error_logging, 'getProperties')
def getProperties(self): def getProperties(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment