Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix cleanup not running when exception occurs in startup. #266

Merged
merged 4 commits into from
Aug 22, 2021
Merged

Fix cleanup not running when exception occurs in startup. #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
564118e
Fix cleanup not running when exception occurs in startup.
Dreamsorcerer Jun 6, 2020
faba167
Update tests.
Dreamsorcerer Jun 6, 2020
027fe13
Missing import.
Dreamsorcerer Jun 6, 2020
e33aba0
Tidyup
Dreamsorcerer Jun 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions aiohttp_devtools/runserver/serve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,9 @@ def serve_main_app(config: Config, tty_path: Optional[str]):
setup_logging(config.verbose)
app_factory = config.import_app_factory()
loop = asyncio.get_event_loop()
runner = loop.run_until_complete(start_main_app(config, app_factory, loop))
runner = loop.run_until_complete(create_main_app(config, app_factory, loop))
try:
loop.run_until_complete(start_main_app(runner, config.main_port))
loop.run_forever()
except KeyboardInterrupt: # pragma: no cover
pass
Expand All @@ -127,17 +128,18 @@ def serve_main_app(config: Config, tty_path: Optional[str]):
loop.run_until_complete(runner.cleanup())


async def start_main_app(config: Config, app_factory, loop):
async def create_main_app(config: Config, app_factory, loop):
app = await config.load_app(app_factory)

modify_main_app(app, config)

await check_port_open(config.main_port, loop)
runner = web.AppRunner(app, access_log_class=AccessLogger)
return web.AppRunner(app, access_log_class=AccessLogger)


async def start_main_app(runner: web.AppRunner, port):
await runner.setup()
site = web.TCPSite(runner, host=HOST, port=config.main_port, shutdown_timeout=0.1)
site = web.TCPSite(runner, host=HOST, port=port, shutdown_timeout=0.1)
await site.start()
return runner


WS = 'websockets'
Expand Down
9 changes: 6 additions & 3 deletions tests/test_runserver_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

from aiohttp_devtools.runserver import run_app, runserver
from aiohttp_devtools.runserver.config import Config
from aiohttp_devtools.runserver.serve import create_auxiliary_app, modify_main_app, src_reload, start_main_app
from aiohttp_devtools.runserver.serve import (create_auxiliary_app, create_main_app, modify_main_app, src_reload,
start_main_app)

from .conftest import SIMPLE_APP

Expand Down Expand Up @@ -155,7 +156,8 @@ async def test_serve_main_app(tmpworkdir, loop, mocker):
loop.call_later(0.5, loop.stop)

config = Config(app_path='app.py')
await start_main_app(config, config.import_app_factory(), loop)
runner = await create_main_app(config, config.import_app_factory(), loop)
await start_main_app(runner, config.main_port)

mock_modify_main_app.assert_called_with(mock.ANY, config)

Expand All @@ -176,7 +178,8 @@ async def hello(request):
mock_modify_main_app = mocker.patch('aiohttp_devtools.runserver.serve.modify_main_app')

config = Config(app_path='app.py')
await start_main_app(config, config.import_app_factory(), loop)
runner = await create_main_app(config, config.import_app_factory(), loop)
await start_main_app(runner, config.main_port)

mock_modify_main_app.assert_called_with(mock.ANY, config)

Expand Down