Update of /cvs-repository/ZODB/src/ZODB
In directory cvs.zope.org:/tmp/cvs-serv472/src/ZODB
Modified Files:
ConflictResolution.py
Added Files:
loglevels.py
Log Message:
Fixed new NameError in check10Kstores introduced by zLoG->logging
conversion (this is an --all test, so the original committer probably
didn't run it).
Introduced a trivial new module (loglevels.py) to centralize creating
the custom log levels ZODB/ZEO want to use.
=== Added File ZODB/src/ZODB/loglevels.py ===
##############################################################################
#
# Copyright (c) 2004 Zope Corporation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
#
##############################################################################
"""Supplies custom logging levels BLATHER and TRACE.
$Revision: 1.1 $
"""
import logging
__all__ = ["BLATHER", "TRACE"]
# In the days of zLOG, there were 7 standard log levels, and ZODB/ZEO used
# all of them. Here's how they map to the logging package's 5 standard
# levels:
#
# zLOG logging
# ------------- ---------------
# PANIC (300) FATAL, CRITICAL (50)
# ERROR (200) ERROR (40)
# WARNING, PROBLEM (100) WARN (30)
# INFO (0) INFO (20)
# BLATHER (-100) none -- defined here as BLATHER (15)
# DEBUG (-200) DEBUG (10)
# TRACE (-300) none -- defined here as TRACE (5)
#
# TRACE is used by ZEO for extremely verbose trace output, enabled only
# when chasing bottom-level communications bugs. It really should be at
# a lower level than DEBUG.
#
# BLATHER is a harder call, and various instances could probably be folded
# into INFO or DEBUG without real harm.
BLATHER = 15
TRACE = 5
logging.addLevelName("BLATHER", BLATHER)
logging.addLevelName("TRACE", TRACE)
=== ZODB/src/ZODB/ConflictResolution.py 1.24 => 1.25 ===
--- ZODB/src/ZODB/ConflictResolution.py:1.24 Sat Apr 17 18:46:18 2004
+++ ZODB/src/ZODB/ConflictResolution.py Thu Apr 22 22:33:58 2004
@@ -18,9 +18,8 @@
from pickle import PicklingError
from ZODB.POSException import ConflictError
+from ZODB.loglevels import BLATHER
-BLATHER = 15
-logging.addLevelName("BLATHER", BLATHER)
logger = logging.getLogger('zodb.ConflictResolution')
ResolvedSerial = 'rs'