Dropped support for wdb interactive debugger.

Author: GrahamDumpleton

README.rst

@@ -306,19 +306,5 @@ the New Relic UI.
 New Relic provides a free Lite tier so there is no excuse for not using it.
 Learn about what your Python web application is really doing. [1]_
 
-Using mod_wsgi express with wdb (Web Debugger)
-----------------------------------------------
-
-If a fan of `wdb <https://github.com/Kozea/wdb>`_ for debugging your web
-application during development, and you already have that installed, you
-can use the ``--with-wdb`` option.
-
-::
-
-    mod_wsgi-express start-server wsgi.py --with-wdb
-
-You do not need to start the wdb server yourself, it will be automatically
-started and managed for you.
-
 .. [1] Disclaimer: I work for New Relic and am the primary developer of
        the Python agent. So of course it is awesome. :-)

docs/release-notes/version-4.3.3.rst

@@ -109,6 +109,10 @@ been explicitly set to define the user and the user is different to the
 user that Apache child worker processes run as. In other words, is
 different to the default Apache user.
 
+2. The support for the ``wdb`` debugger was removed. Decided that it wasn't
+mainstream enough and not ideal that still required a separate service and
+port to handle debugging sessions.
+
 New Features
 ------------
 

src/server/__init__.py

@@ -659,11 +659,6 @@ def find_mimetypes():
     process-group=express application-group=server-metrics
 """
 
-APACHE_WDB_CONFIG = """
-WSGIImportScript '%(server_root)s/wdb-server.py' \\
-    process-group=express application-group=wdb-server
-"""
-
 def generate_apache_config(options):
     with open(options['httpd_conf'], 'w') as fp:
         print(APACHE_GENERAL_CONFIG % options, file=fp)
@@ -718,15 +713,12 @@ def generate_apache_config(options):
                 print(APACHE_INCLUDE_CONFIG % dict(filename=filename),
                         file=fp)
 
-        if options['with_newrelic_platform'] or options['with_wdb']:
+        if options['with_newrelic_platform']:
             print(APACHE_TOOLS_CONFIG % options, file=fp)
 
         if options['with_newrelic_platform']:
             print(APACHE_METRICS_CONFIG % options, file=fp)
 
-        if options['with_wdb']:
-            print(APACHE_WDB_CONFIG % options, file=fp)
-
 _interval = 1.0
 _times = {}
 _files = []
@@ -873,7 +865,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,
+            with_newrelic_agent=False, debug_mode=False,
             enable_debugger=False):
 
         self.entry_point = entry_point
@@ -916,9 +908,6 @@ def __init__(self, entry_point, application_type='script',
         if with_newrelic_agent:
             self.setup_newrelic_agent()
 
-        if with_wdb:
-            self.setup_wdb()
-
         self.debug_mode = debug_mode
         self.enable_debugger = enable_debugger
 
@@ -941,10 +930,6 @@ def setup_newrelic_agent(self):
         self.application = newrelic.agent.WSGIApplicationWrapper(
                 self.application)
 
-    def setup_wdb(self):
-        from wdb.ext import WdbMiddleware
-        self.application = WdbMiddleware(self.application)
-
     def setup_post_mortem_debugging(self):
         self.application = PostMortemDebugger(self.application)
 
@@ -1037,7 +1022,6 @@ def __call__(self, environ, start_response):
 with_newrelic_agent = %(with_newrelic_agent)s
 newrelic_config_file = '%(newrelic_config_file)s'
 newrelic_environment = '%(newrelic_environment)s'
-with_wdb = %(with_wdb)s
 reload_on_changes = %(reload_on_changes)s
 debug_mode = %(debug_mode)s
 enable_debugger = %(enable_debugger)s
@@ -1087,8 +1071,7 @@ def output_profiler_data():
 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_debugger=enable_debugger)
+        debug_mode=debug_mode, enable_debugger=enable_debugger)
 
 reload_required = handler.reload_required
 handle_request = handler.handle_request
@@ -1203,36 +1186,6 @@ def generate_server_metrics_script(options):
     with open(path, 'w') as fp:
         print(SERVER_METRICS_SCRIPT % options, file=fp)
 
-WDB_SERVER_SCRIPT = """
-from wdb_server import server
-try:
-    from wdb_server.sockets import handle_connection
-except ImportError:
-    from wdb_server.streams import handle_connection
-
-from tornado.ioloop import IOLoop
-from tornado.options import options
-from tornado.netutil import bind_sockets, add_accept_handler
-from threading import Thread
-
-def run_server():
-    ioloop = IOLoop.instance()
-    sockets = bind_sockets(options.socket_port)
-    for socket in sockets:
-        add_accept_handler(socket, handle_connection, ioloop)
-    server.listen(options.server_port)
-    ioloop.start()
-
-thread = Thread(target=run_server)
-thread.setDaemon(True)
-thread.start()
-"""
-
-def generate_wdb_server_script(options):
-    path = os.path.join(options['server_root'], 'wdb-server.py')
-    with open(path, 'w') as fp:
-        print(WDB_SERVER_SCRIPT, file=fp)
-
 WSGI_CONTROL_SCRIPT = """
 #!/bin/sh
 
@@ -1747,10 +1700,6 @@ def check_percentage(option, opt_str, value, parser):
             default='', help='Specify the name of the environment section '
             'that should be used from New Relic agent configuration file.'),
 
-    optparse.make_option('--with-wdb', action='store_true', default=False,
-            help='Flag indicating whether the wdb interactive debugger '
-            'should be enabled for the WSGI application.'),
-
     optparse.make_option('--with-php5', action='store_true', default=False,
             help='Flag indicating whether PHP 5 support should be enabled.'),
 
@@ -2232,9 +2181,6 @@ def _cmd_setup_server(command, args, options):
     if options['with_newrelic_platform']:
         generate_server_metrics_script(options)
 
-    if options['with_wdb']:
-        generate_wdb_server_script(options)
-
     generate_apache_config(options)
     generate_control_scripts(options)