summaryrefslogtreecommitdiff
path: root/src/server/__init__.py
diff options
context:
space:
mode:
authorGraham Dumpleton <Graham.Dumpleton@gmail.com>2014-11-28 06:55:37 +1100
committerGraham Dumpleton <Graham.Dumpleton@gmail.com>2014-11-28 06:55:37 +1100
commitfa648e14abfe8290370e20b0f92637028b201fd0 (patch)
tree37008a0bcaa9648082c5a48f84f58e14f1a5d686 /src/server/__init__.py
parente025c5f56f176b0d4f19a0a665a06180db925e72 (diff)
downloadmod_wsgi-fa648e14abfe8290370e20b0f92637028b201fd0.tar.gz
Change name of debugger option in debug mode.
Diffstat (limited to 'src/server/__init__.py')
-rw-r--r--src/server/__init__.py22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/server/__init__.py b/src/server/__init__.py
index c21d206..177fdfc 100644
--- a/src/server/__init__.py
+++ b/src/server/__init__.py
@@ -871,7 +871,7 @@ class ApplicationHandler(object):
def __init__(self, entry_point, application_type='script',
callable_object='application', mount_point='/',
with_newrelic_agent=False, with_wdb=False, debug_mode=False,
- enable_pdb=False):
+ enable_debugger=False):
self.entry_point = entry_point
self.application_type = application_type
@@ -917,9 +917,9 @@ class ApplicationHandler(object):
self.setup_wdb()
self.debug_mode = debug_mode
- self.enable_pdb = enable_pdb
+ self.enable_debugger = enable_debugger
- if debug_mode and enable_pdb:
+ if debug_mode and enable_debugger:
self.setup_post_mortem_debugging()
def setup_newrelic_agent(self):
@@ -1032,7 +1032,7 @@ newrelic_environment = '%(newrelic_environment)s'
with_wdb = %(with_wdb)s
reload_on_changes = %(reload_on_changes)s
debug_mode = %(debug_mode)s
-enable_pdb = %(enable_pdb)s
+enable_debugger = %(enable_debugger)s
if with_newrelic_agent:
if newrelic_config_file:
@@ -1043,7 +1043,8 @@ if with_newrelic_agent:
handler = mod_wsgi.server.ApplicationHandler(entry_point,
application_type=application_type, callable_object=callable_object,
mount_point=mount_point, with_newrelic_agent=with_newrelic_agent,
- with_wdb=with_wdb, debug_mode=debug_mode, enable_pdb=enable_pdb)
+ with_wdb=with_wdb, debug_mode=debug_mode,
+ enable_debugger=enable_debugger)
reload_required = handler.reload_required
handle_request = handler.handle_request
@@ -1713,11 +1714,12 @@ option_list = (
'will also be disabled. Both stdin and stdout will be attached '
'to the console to allow interaction with the Python debugger.'),
- optparse.make_option('--enable-pdb', action='store_true', default=False,
- help='Flag indicating whether post mortem debugging of any '
- 'exceptions which propogate out from the WSGI application '
- 'when running in debug mode should be performed. Post mortem '
- 'debugging is performed using the Python debugger (pdb).'),
+ optparse.make_option('--enable-debugger', action='store_true',
+ default=False, help='Flag indicating whether post mortem '
+ 'debugging of any exceptions which propogate out from the '
+ 'WSGI application when running in debug mode should be '
+ 'performed. Post mortem debugging is performed using the '
+ 'Python debugger (pdb).'),
optparse.make_option('--setup-only', action='store_true', default=False,
help='Flag indicating that after the configuration files have '