Commit 1185d4ee authored by Andreas Jung's avatar Andreas Jung

zLOG -> logging

parent c6713a93
...@@ -15,6 +15,7 @@ __doc__='''Generic Database Connection Support ...@@ -15,6 +15,7 @@ __doc__='''Generic Database Connection Support
$Id$''' $Id$'''
__version__='$Revision: 1.39 $'[11:-2] __version__='$Revision: 1.39 $'[11:-2]
from logging import getLogger
import Globals, OFS.SimpleItem, AccessControl.Role, Acquisition, sys import Globals, OFS.SimpleItem, AccessControl.Role, Acquisition, sys
from DateTime import DateTime from DateTime import DateTime
from App.Dialogs import MessageDialog from App.Dialogs import MessageDialog
...@@ -30,11 +31,14 @@ from Aqueduct import custom_default_report ...@@ -30,11 +31,14 @@ from Aqueduct import custom_default_report
from cStringIO import StringIO from cStringIO import StringIO
from Results import Results from Results import Results
from sys import exc_info from sys import exc_info
from zLOG import LOG, ERROR
from cgi import escape from cgi import escape
import DocumentTemplate, RDB import DocumentTemplate, RDB
from zExceptions import BadRequest from zExceptions import BadRequest
LOG = getLogger('ZRDB.Connection')
class Connection( class Connection(
Globals.Persistent, Globals.Persistent,
AccessControl.Role.RoleManager, AccessControl.Role.RoleManager,
...@@ -67,10 +71,8 @@ class Connection( ...@@ -67,10 +71,8 @@ class Connection(
if self.connection_string: if self.connection_string:
try: self.connect(self.connection_string) try: self.connect(self.connection_string)
except: except:
LOG('Shared.DC.ZRDB.Connection', LOG.error('Error connecting to relational database.',
ERROR, exc_info=exc_info())
'Error connecting to relational database.',
error=exc_info())
def title_and_id(self): def title_and_id(self):
s=Connection.inheritedAttribute('title_and_id')(self) s=Connection.inheritedAttribute('title_and_id')(self)
...@@ -157,10 +159,8 @@ class Connection( ...@@ -157,10 +159,8 @@ class Connection(
if hasattr(self,'_v_database_connection'): if hasattr(self,'_v_database_connection'):
self._v_database_connection.close() self._v_database_connection.close()
except: except:
LOG('Shared.DC.ZRDB.Connection', LOG.error('Error closing relational database connection.',
ERROR, exc_info=exc_info())
'Error closing relational database connection.',
error=exc_info())
self._v_connected='' self._v_connected=''
if REQUEST is not None: if REQUEST is not None:
return self.manage_main(self, REQUEST) return self.manage_main(self, REQUEST)
......
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