Feat: Max requests flag to exit after N requests

.gitignore

@@ -13,3 +13,4 @@ test_consumer*
 .python-version
 .pytest_cache/
 .vscode
+.dccache

daphne/__init__.py

@@ -1,6 +1,6 @@
 import sys
 
-__version__ = "3.0.2"
+__version__ = "3.0.15"
 
 
 # Windows on Python 3.8+ uses ProactorEventLoop, which is not compatible with

daphne/cli.py

@@ -148,6 +148,14 @@ def __init__(self):
             default=False,
             action="store",
         )
+        self.max_requests = self.parser.add_argument(
+            "--max-requests",
+            dest="max_requests",
+            help="The maximum number of requests a worker will process before restarting.",
+            default=float('inf'),
+            action="store",
+            type=int,
+        )
         self.parser.add_argument(
             "application",
             help="The application to dispatch to as path.to.module:instance.path",
@@ -259,6 +267,7 @@ def run(self, args):
         endpoints = sorted(args.socket_strings + endpoints)
         # Start the server
         logger.info("Starting server at {}".format(", ".join(endpoints)))
+        logger.info(args.max_requests)
         self.server = self.server_class(
             application=application,
             endpoints=endpoints,
@@ -281,5 +290,6 @@ def run(self, args):
             if args.proxy_headers
             else None,
             server_name=args.server_name,
+            max_requests=args.max_requests,
         )
         self.server.run()

daphne/http_protocol.py

@@ -1,4 +1,6 @@
 import logging
+import os
+import sys
 import time
 import traceback
 from urllib.parse import unquote
@@ -13,7 +15,6 @@
 
 logger = logging.getLogger(__name__)
 
-
 class WebRequest(http.Request):
     """
     Request that either hands off information to channels, or offloads
@@ -198,6 +199,15 @@ def process(self):
                     if not more_body:
                         break
 
+                # Count completed requests and check against Max
+                self.server._complete_requests_counted += 1
+                if self.server._complete_requests_counted > self.server.max_requests:
+                    logger.info('Max requests completed. Shutting down daphne...')
+                    os.system("ps aux | grep 'daphne'")
+                    bash_command = "kill $(ps aux | grep 'daphne' | awk '{print $2}')"
+                    os.system(bash_command)
+                    sys.exit(0)
+
         except Exception:
             logger.error(traceback.format_exc())
             self.basic_error(

daphne/server.py

@@ -57,6 +57,7 @@ def __init__(
         application_close_timeout=10,
         ready_callable=None,
         server_name="Daphne",
+        max_requests=float('inf'),
         # Deprecated and does not work, remove in version 2.2
         ws_protocols=None,
     ):
@@ -82,6 +83,8 @@ def __init__(
         self.abort_start = False
         self.ready_callable = ready_callable
         self.server_name = server_name
+        self.max_requests = max_requests
+        self._complete_requests_counted = 0
         # Check our construction is actually sensible
         if not self.endpoints:
             logger.error("No endpoints. This server will not listen on anything.")

notes.txt

@@ -0,0 +1,7 @@
+Build: python setup.py sdist bdist_wheel
+Test Upload: twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+Prod Upload: twine upload dist/*
+
+Test Install: pip install -i https://test.pypi.org/simple/ adam-daphne==3.0.9
+
+Uninstall everything: pip freeze | xargs pip uninstall -y

setup.py

@@ -10,7 +10,7 @@
     long_description = fp.read()
 
 setup(
-    name="daphne",
+    name="adam-daphne",
     version=__version__,
     url="https://github.com/django/daphne",
     author="Django Software Foundation",