Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZEO
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
ZEO
Commits
bbd6d73e
Commit
bbd6d73e
authored
Apr 17, 2004
by
Gintautas Miliauskas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated ConflictResolution to use logging instead of zLOG.
parent
8b486f09
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
src/ZODB/ConflictResolution.py
src/ZODB/ConflictResolution.py
+7
-5
No files found.
src/ZODB/ConflictResolution.py
View file @
bbd6d73e
...
...
@@ -12,12 +12,16 @@
#
##############################################################################
import
sys
import
logging
from
cStringIO
import
StringIO
from
cPickle
import
Unpickler
,
Pickler
from
pickle
import
PicklingError
from
ZODB.POSException
import
ConflictError
import
zLOG
BLATHER
=
15
logging
.
addLevelName
(
"BLATHER"
,
BLATHER
)
logger
=
logging
.
getLogger
(
'zodb.ConflictResolution'
)
ResolvedSerial
=
'rs'
...
...
@@ -39,8 +43,7 @@ def find_global(*args):
_class_cache
[
args
]
=
cls
if
cls
==
1
:
zLOG
.
LOG
(
"Conflict Resolution"
,
zLOG
.
BLATHER
,
"Unable to load class"
,
error
=
sys
.
exc_info
())
logger
.
log
(
BLATHER
,
"Unable to load class"
,
exc_info
=
True
)
if
cls
==
1
:
# Not importable
...
...
@@ -136,8 +139,7 @@ def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle,
# the original ConflictError. A client can recover from a
# ConflictError, but not necessarily from other errors. But log
# the error so that any problems can be fixed.
zLOG
.
LOG
(
"Conflict Resolution"
,
zLOG
.
ERROR
,
"Unexpected error"
,
error
=
sys
.
exc_info
())
logger
.
error
(
"Unexpected error"
,
exc_info
=
True
)
return
None
class
ConflictResolvingStorage
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment