django/daphne
1
1
Fork 0
mirror of https://github.com/django/daphne.git synced 2025-07-30 00:49:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add protocol/server_cls attributes to runserver for extensibility (#661)

Browse Source 
Makes it easier to extend the runserver command with custom behaviour.
This commit is contained in:
David Sanders 2017-06-08 00:17:33 -07:00 committed by Andrew Godwin
parent 4450e0607d
commit 4d524f2d00
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
channels/management/commands/runserver.py
View File

@ -17,6 +17,8 @@ from channels.worker import Worker
class Command(RunserverCommand): class Command(RunserverCommand):
protocol = 'http'
server_cls = Server
def add_arguments(self, parser): def add_arguments(self, parser):
super(Command, self).add_arguments(parser) super(Command, self).add_arguments(parser)
@ -58,12 +60,13 @@ class Command(RunserverCommand):
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 Channels development server at http://%(addr)s:%(port)s/\n" "Starting Channels development server at %(protocol)s://%(addr)s:%(port)s/\n"
"Channel layer %(layer)s\n" "Channel layer %(layer)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,
@ -84,7 +87,7 @@ class Command(RunserverCommand):
# build the endpoint description string from host/port options # build the endpoint description string from host/port options
endpoints = build_endpoint_description_strings(host=self.addr, port=self.port) endpoints = build_endpoint_description_strings(host=self.addr, port=self.port)
try: try:
Server( self.server_cls(
channel_layer=self.channel_layer, channel_layer=self.channel_layer,
endpoints=endpoints, endpoints=endpoints,
signal_handlers=not options['use_reloader'], signal_handlers=not options['use_reloader'],

6
tests/test_management.py
View File

@ -122,7 +122,7 @@ class RunServerTests(TestCase):
channels.log.handler = logging.StreamHandler(self.stream) channels.log.handler = logging.StreamHandler(self.stream)
@mock.patch('channels.management.commands.runserver.sys.stdout', new_callable=StringIO) @mock.patch('channels.management.commands.runserver.sys.stdout', new_callable=StringIO)
@mock.patch('channels.management.commands.runserver.Server') @mock.patch('channels.management.commands.runserver.Command.server_cls')
@mock.patch('channels.management.commands.runworker.Worker') @mock.patch('channels.management.commands.runworker.Worker')
def test_runserver_basic(self, mocked_worker, mocked_server, mock_stdout): def test_runserver_basic(self, mocked_worker, mocked_server, mock_stdout):
# Django's autoreload util uses threads and this is not needed # Django's autoreload util uses threads and this is not needed
@ -142,7 +142,7 @@ class RunServerTests(TestCase):
) )
@mock.patch('channels.management.commands.runserver.sys.stdout', new_callable=StringIO) @mock.patch('channels.management.commands.runserver.sys.stdout', new_callable=StringIO)
@mock.patch('channels.management.commands.runserver.Server') @mock.patch('channels.management.commands.runserver.Command.server_cls')
@mock.patch('channels.management.commands.runworker.Worker') @mock.patch('channels.management.commands.runworker.Worker')
def test_runserver_debug(self, mocked_worker, mocked_server, mock_stdout): def test_runserver_debug(self, mocked_worker, mocked_server, mock_stdout):
""" """
@ -180,7 +180,7 @@ class RunServerTests(TestCase):
) )
@mock.patch('channels.management.commands.runserver.sys.stdout', new_callable=StringIO) @mock.patch('channels.management.commands.runserver.sys.stdout', new_callable=StringIO)
@mock.patch('channels.management.commands.runserver.Server') @mock.patch('channels.management.commands.runserver.Command.server_cls')
@mock.patch('channels.management.commands.runworker.Worker') @mock.patch('channels.management.commands.runworker.Worker')
def test_runserver_noworker(self, mocked_worker, mocked_server, mock_stdout): def test_runserver_noworker(self, mocked_worker, mocked_server, mock_stdout):
''' '''