Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
erp5
Commits
e632443f
Commit
e632443f
authored
Jan 16, 2015
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Add counter to manage_debug_thread SQL queries"
This reverts commit
c00318de
.
parent
c00318de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
5 deletions
+1
-5
product/DeadlockDebugger/dumper.py
product/DeadlockDebugger/dumper.py
+1
-2
product/ZMySQLDA/db.py
product/ZMySQLDA/db.py
+0
-3
No files found.
product/DeadlockDebugger/dumper.py
View file @
e632443f
...
@@ -69,8 +69,7 @@ def dump_threads():
...
@@ -69,8 +69,7 @@ def dump_threads():
while
f
is
not
None
:
while
f
is
not
None
:
code
=
f
.
f_code
code
=
f
.
f_code
if
code
is
DB
.
_query
.
func_code
:
if
code
is
DB
.
_query
.
func_code
:
mysql_info
=
"
\
n
MySQL query #%s:
\
n
%s
\
n
"
%
(
f
.
f_locals
[
'self'
].
_count
,
mysql_info
=
"
\
n
MySQL query:
\
n
%s
\
n
"
%
f
.
f_locals
[
'query'
]
f
.
f_locals
[
'query'
])
break
break
f
=
f
.
f_back
f
=
f
.
f_back
except
ImportError
:
except
ImportError
:
...
...
product/ZMySQLDA/db.py
View file @
e632443f
...
@@ -319,7 +319,6 @@ class DB(TM):
...
@@ -319,7 +319,6 @@ class DB(TM):
because they are bound to the connection. This check can be
because they are bound to the connection. This check can be
overridden by passing force_reconnect with True value.
overridden by passing force_reconnect with True value.
"""
"""
self
.
_count
+=
1
try
:
try
:
self
.
db
.
query
(
query
)
self
.
db
.
query
(
query
)
except
OperationalError
,
m
:
except
OperationalError
,
m
:
...
@@ -333,7 +332,6 @@ class DB(TM):
...
@@ -333,7 +332,6 @@ class DB(TM):
raise
raise
# Hm. maybe the db is hosed. Let's restart it.
# Hm. maybe the db is hosed. Let's restart it.
self
.
_forceReconnection
()
self
.
_forceReconnection
()
self
.
_count
+=
1
self
.
db
.
query
(
query
)
self
.
db
.
query
(
query
)
except
ProgrammingError
,
exception
:
except
ProgrammingError
,
exception
:
LOG
(
'ZMySQLDA'
,
ERROR
,
'query failed: %s'
%
(
query
,))
LOG
(
'ZMySQLDA'
,
ERROR
,
'query failed: %s'
%
(
query
,))
...
@@ -401,7 +399,6 @@ class DB(TM):
...
@@ -401,7 +399,6 @@ class DB(TM):
def
_begin
(
self
,
*
ignored
):
def
_begin
(
self
,
*
ignored
):
"""Begin a transaction (when TM is enabled)."""
"""Begin a transaction (when TM is enabled)."""
self
.
_count
=
0
try
:
try
:
self
.
_transaction_begun
=
True
self
.
_transaction_begun
=
True
# Ping the database to reconnect if connection was closed.
# Ping the database to reconnect if connection was closed.
...
...
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