Log message for revision 40821:
Merged Zope-2_8-branch -r40818:40819 into the trunk.
(Made sure logging is configured. Read $INSTANCE_HOME/log.ini if it exists.)
Changed:
U Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py
U Zope/trunk/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
U Zope/trunk/lib/python/Testing/ZopeTestCase/ztc_common.py
-=-
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py 2005-12-16
18:44:55 UTC (rev 40820)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py 2005-12-16
18:46:32 UTC (rev 40821)
@@ -58,8 +58,9 @@
def _configure_logging():
# Initialize the logging module
- if not sys.modules.has_key('logging'):
- import logging
+ import logging
+ root = logging.getLogger()
+ if not root.handlers:
logging.basicConfig()
def _configure_debug_mode():
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt 2005-12-16
18:44:55 UTC (rev 40820)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt 2005-12-16
18:46:32 UTC (rev 40821)
@@ -6,6 +6,7 @@
- installProduct() now becomes a noop if ZopeTestCase did not apply its
patches.
- Made the functional doc tests set the cookie related headers.
+- Made sure logging is configured. Read $INSTANCE_HOME/log.ini if it exists.
0.9.8 (Zope 2.8 edition)
- Renamed 'doctest' package to 'zopedoctest' because of name-shadowing
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/ztc_common.py
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/ztc_common.py 2005-12-16
18:44:55 UTC (rev 40820)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/ztc_common.py 2005-12-16
18:46:32 UTC (rev 40821)
@@ -17,7 +17,7 @@
execfile(os.path.join(os.path.dirname(Testing.__file__),
'ZopeTestCase', 'ztc_common.py'))
-$Id: ztc_common.py,v 1.14 2004/05/27 15:06:24 shh42 Exp $
+$Id$
"""
# Overwrites the default framework() method to expose the
@@ -62,11 +62,13 @@
return
if self.zeo_instance_home:
self.setup_zeo_instance_home()
+ self.setup_logging()
else:
if self.instance_home:
self.setup_instance_home()
else:
self.detect_and_setup_instance_home()
+ self.setup_logging()
self.setup_custom_zodb()
def setup_zeo_instance_home(self):
@@ -128,6 +130,13 @@
os.environ['INSTANCE_HOME'] = INSTANCE_HOME = self.cwd
self.setconfig(instancehome=self.cwd)
+ def setup_logging(self):
+ '''If $INSTANCE_HOME/log.ini exists, load it.'''
+ logini = os.path.join(self.getconfig('instancehome'), 'log.ini')
+ if os.path.exists(logini):
+ import logging.config
+ logging.config.fileConfig(logini)
+
def add_instance(self, p):
'''Adds an INSTANCE_HOME directory to Products.__path__ and
sys.path.'''
import Products
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
