p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #27705 -- Added protocol/server_cls attributes to runserver for extensibility.

This commit is contained in:
David Sanders 2017-01-09 08:41:33 -07:00 committed by Tim Graham
parent 0a47b675b0
commit e5e3747357
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/core/management/commands/runserver.py
View File

@ -9,7 +9,9 @@ from datetime import datetime
from django.conf import settings from django.conf import settings
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from django.core.servers.basehttp import get_internal_wsgi_application, run from django.core.servers.basehttp import (
WSGIServer, get_internal_wsgi_application, run,
)
from django.utils import autoreload, six from django.utils import autoreload, six
from django.utils.encoding import force_text, get_system_encoding from django.utils.encoding import force_text, get_system_encoding
@ -30,6 +32,8 @@ class Command(BaseCommand):
leave_locale_alone = True leave_locale_alone = True
default_port = '8000' default_port = '8000'
protocol = 'http'
server_cls = WSGIServer
def add_arguments(self, parser): def add_arguments(self, parser):
parser.add_argument( parser.add_argument(
@ -128,11 +132,12 @@ class Command(BaseCommand):
self.stdout.write(now) self.stdout.write(now)
self.stdout.write(( self.stdout.write((
"Django version %(version)s, using settings %(settings)r\n" "Django version %(version)s, using settings %(settings)r\n"
"Starting development server at http://%(addr)s:%(port)s/\n" "Starting development server at %(protocol)s://%(addr)s:%(port)s/\n"
"Quit the server with %(quit_command)s.\n" "Quit the server with %(quit_command)s.\n"
) % { ) % {
"version": self.get_version(), "version": self.get_version(),
"settings": settings.SETTINGS_MODULE, "settings": settings.SETTINGS_MODULE,
"protocol": self.protocol,
"addr": '[%s]' % self.addr if self._raw_ipv6 else self.addr, "addr": '[%s]' % self.addr if self._raw_ipv6 else self.addr,
"port": self.port, "port": self.port,
"quit_command": quit_command, "quit_command": quit_command,
@ -141,7 +146,7 @@ class Command(BaseCommand):
try: try:
handler = self.get_handler(*args, **options) handler = self.get_handler(*args, **options)
run(self.addr, int(self.port), handler, run(self.addr, int(self.port), handler,
ipv6=self.use_ipv6, threading=threading) ipv6=self.use_ipv6, threading=threading, server_cls=self.server_cls)
except socket.error as e: except socket.error as e:
# Use helpful error messages instead of ugly tracebacks. # Use helpful error messages instead of ugly tracebacks.
ERRORS = { ERRORS = {

6
django/core/servers/basehttp.py
View File

@ -160,12 +160,12 @@ class WSGIRequestHandler(simple_server.WSGIRequestHandler, object):
handler.run(self.server.get_app()) handler.run(self.server.get_app())
def run(addr, port, wsgi_handler, ipv6=False, threading=False): def run(addr, port, wsgi_handler, ipv6=False, threading=False, server_cls=WSGIServer):
server_address = (addr, port) server_address = (addr, port)
if threading: if threading:
httpd_cls = type(str('WSGIServer'), (socketserver.ThreadingMixIn, WSGIServer), {}) httpd_cls = type(str('WSGIServer'), (socketserver.ThreadingMixIn, server_cls), {})
else: else:
httpd_cls = WSGIServer httpd_cls = server_cls
httpd = httpd_cls(server_address, WSGIRequestHandler, ipv6=ipv6) httpd = httpd_cls(server_address, WSGIRequestHandler, ipv6=ipv6)
if threading: if threading:
# ThreadingMixIn.daemon_threads indicates how threads will behave on an # ThreadingMixIn.daemon_threads indicates how threads will behave on an