Changeset 1141 for ZMS/trunk/_globals.py

Timestamp:

02.09.2010 22:19:28 (21 months ago)

Author:

zmsdev

Message:

Applied fix for exception-logging in writeError()

File:

• ZMS/trunk/_globals.py (modified) (2 diffs)

ZMS/trunk/_globals.py

@@ -632 +632 @@
 _globals.writeError:
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-def writeError(self, etc=''):
-  info = '?'
+def writeError(self, info):
   try:
     LOG.error(info)
@@ -639 +638 @@
     v = str(v)
     # Strip HTML tags from the error value
-    import re
-    remove = [r"<[^<>]*>", r"&[A-Za-z]+;"]
-    for pat in remove:
-      v = re.sub(pat,' ', v)
-    if etc: etc += '\n'
+    for pattern in [r"<[^<>]*>", r"&[A-Za-z]+;"]:
+      v = re_sub(self, pattern,' ', v)
+    if info: 
+      info += '\n'
     severity = logging.ERROR
-    info = etc+''.join(format_exception(t, v, tb))
+    info += ''.join(format_exception(t, v, tb))
     info = "[%s@%s]"%(self.meta_id,self.absolute_url()[len(self.REQUEST['SERVER_URL']):]) + info
     zms_log = getattr( self, 'zms_log', None)