Fix crash on exist with "--uds" if socket not exists #1725
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Do you have a MRE? |
|
Yes: With this app ( from starlette.applications import Starlette
app = Starlette()
@app.on_event("startup")
async def startup():
raise RuntimeErrorAnd the command INFO: Started server process [28861]
INFO: Waiting for application startup.
ERROR: Traceback (most recent call last):
File "/home/fedora/.cache/pypoetry/virtualenvs/mre-Y0ZI6pHK-py3.10/lib/python3.10/site-packages/starlette/routing.py", line 645, in lifespan
async with self.lifespan_context(app):
File "/home/fedora/.cache/pypoetry/virtualenvs/mre-Y0ZI6pHK-py3.10/lib/python3.10/site-packages/starlette/routing.py", line 540, in __aenter__
await self._router.startup()
File "/home/fedora/.cache/pypoetry/virtualenvs/mre-Y0ZI6pHK-py3.10/lib/python3.10/site-packages/starlette/routing.py", line 622, in startup
await handler()
File "/home/fedora/Documents/./mre.py", line 7, in startup
raise RuntimeError
RuntimeError
ERROR: Application startup failed. Exiting.
Traceback (most recent call last):
File "/home/fedora/.cache/pypoetry/virtualenvs/mre-Y0ZI6pHK-py3.10/bin/uvicorn", line 8, in <module>
sys.exit(main())
File "/home/fedora/.cache/pypoetry/virtualenvs/mre-Y0ZI6pHK-py3.10/lib/python3.10/site-packages/click/core.py", line 1130, in __call__
return self.main(*args, **kwargs)
File "/home/fedora/.cache/pypoetry/virtualenvs/mre-Y0ZI6pHK-py3.10/lib/python3.10/site-packages/click/core.py", line 1055, in main
rv = self.invoke(ctx)
File "/home/fedora/.cache/pypoetry/virtualenvs/mre-Y0ZI6pHK-py3.10/lib/python3.10/site-packages/click/core.py", line 1404, in invoke
return ctx.invoke(self.callback, **ctx.params)
File "/home/fedora/.cache/pypoetry/virtualenvs/mre-Y0ZI6pHK-py3.10/lib/python3.10/site-packages/click/core.py", line 760, in invoke
return __callback(*args, **kwargs)
File "/home/fedora/.cache/pypoetry/virtualenvs/mre-Y0ZI6pHK-py3.10/lib/python3.10/site-packages/uvicorn/main.py", line 404, in main
run(
File "/home/fedora/.cache/pypoetry/virtualenvs/mre-Y0ZI6pHK-py3.10/lib/python3.10/site-packages/uvicorn/main.py", line 571, in run
os.remove(config.uds) # pragma: py-win32
FileNotFoundError: [Errno 2] No such file or directory: '/tmp/uvicorn.sock' |
|
Thanks. I'll check later today. 🙏 |
iudeen
reviewed
Oct 28, 2022
| @@ -95,7 +95,6 @@ def test_cli_call_multiprocess_run() -> None: | |||
| def test_cli_uds(tmp_path: Path) -> None: # pragma: py-win32 | |||
| runner = CliRunner() | |||
| uds_file = tmp_path / "uvicorn.sock" | |||
| uds_file.touch(exist_ok=True) | |||
There was a problem hiding this comment.
This change has reduced coverage on this file. Added back in #1741
There was a problem hiding this comment.
Line 571 in main.py
due to this os.path.exists(config.uds)
There was a problem hiding this comment.
Let's test both scenarios - I'm already on it.
Kludex
added a commit
to sephioh/uvicorn
that referenced
this pull request
Oct 29, 2022
Co-authored-by: Marcelo Trylesinski <marcelotryle@gmail.com>
Kludex
added a commit
that referenced
this pull request
Oct 29, 2022
Co-authored-by: Marcelo Trylesinski <marcelotryle@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently uvicorn may crash when exiting if run with the "--uds" option, and if Uvicorn exits before the socket creation (For instance if the application to run crash on statup).
This PR fix the issue by ignoring the exception in that case.