Commit 8661f0c6 authored by Vincent Pelletier's avatar Vincent Pelletier

fixup! Use sys._current_frames instead of threadframe.

Forgot to drop extra threadframe references.
parent 575004c1
...@@ -14,14 +14,6 @@ DeadlockDebugger can of course also be used in non-deadlock situations, ...@@ -14,14 +14,6 @@ DeadlockDebugger can of course also be used in non-deadlock situations,
when a Zope process is taking a long time and you wish to know what code when a Zope process is taking a long time and you wish to know what code
is being executed. is being executed.
Installation
------------
This product requires the 'threadframe' python module
(http://www.majid.info/mylos/stories/2004/06/10/threadframe.html).
When DeadlockDebugger starts, it verifies that threadframe is available,
please check the event.log for ERROR message.
Configuration Configuration
------------- -------------
......
...@@ -28,24 +28,19 @@ You MUST configure zope.conf before use. ...@@ -28,24 +28,19 @@ You MUST configure zope.conf before use.
from zLOG import LOG, INFO, ERROR from zLOG import LOG, INFO, ERROR
from App.config import getConfiguration from App.config import getConfiguration
try: config = getConfiguration()
import threadframe if getattr(config, 'product_config', None) is not None:
except ImportError: deadlockdebugger = config.product_config.get('deadlockdebugger')
LOG('DeadlockDebugger', ERROR, "Incorrectly installed threadframe module") dump_url = ''
else: secret = ''
config = getConfiguration() if deadlockdebugger is None:
if getattr(config, 'product_config', None) is not None: LOG('DeadlockDebugger', ERROR, 'Missing configuration statement '
deadlockdebugger = config.product_config.get('deadlockdebugger') '<product-config deadlockdebugger>, not activated')
dump_url = '' else:
secret = '' if not 'dump_url' in deadlockdebugger:
if deadlockdebugger is None: LOG('DeadlockDebugger', ERROR, 'Please configure dump_url and '
LOG('DeadlockDebugger', ERROR, 'Missing configuration statement ' 'optionally secret in <product-config deadlockdebugger>, not '
'<product-config deadlockdebugger>, not activated') 'activated')
else: else:
if not 'dump_url' in deadlockdebugger: import dumper
LOG('DeadlockDebugger', ERROR, 'Please configure dump_url and ' LOG('DeadlockDebugger', INFO, "Installed")
'optionally secret in <product-config deadlockdebugger>, not '
'activated')
else:
import dumper
LOG('DeadlockDebugger', INFO, "Installed")
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