Kludex/uvicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo: error_occured -> error_occurred (#2776)

Browse Source
This commit is contained in:
t-kawasumi 2025-12-25 17:26:05 +09:00 committed by GitHub
parent 9ff60042a5
commit ae56d07af7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_lifespan.py
View File

@ -98,7 +98,7 @@ def test_lifespan_auto_with_error():
lifespan = LifespanOn(config)
await lifespan.startup()
assert lifespan.error_occured
assert lifespan.error_occurred
assert not lifespan.should_exit
await lifespan.shutdown()
@ -117,7 +117,7 @@ def test_lifespan_on_with_error():
lifespan = LifespanOn(config)
await lifespan.startup()
assert lifespan.error_occured
assert lifespan.error_occurred
assert lifespan.should_exit
await lifespan.shutdown()
@ -143,7 +143,7 @@ def test_lifespan_with_failed_startup(mode, raise_exception, caplog):
await lifespan.startup()
assert lifespan.startup_failed
assert lifespan.error_occured is raise_exception
assert lifespan.error_occurred is raise_exception
assert lifespan.should_exit
await lifespan.shutdown()
@ -171,7 +171,7 @@ def test_lifespan_scope_asgi3app():
await lifespan.startup()
assert not lifespan.startup_failed
assert not lifespan.error_occured
assert not lifespan.error_occurred
assert not lifespan.should_exit
await lifespan.shutdown()
@ -228,7 +228,7 @@ def test_lifespan_with_failed_shutdown(mode, raise_exception, caplog):
assert not lifespan.startup_failed
await lifespan.shutdown()
assert lifespan.shutdown_failed
assert lifespan.error_occured is raise_exception
assert lifespan.error_occurred is raise_exception
assert lifespan.should_exit
loop = asyncio.new_event_loop()

10
uvicorn/lifespan/on.py
View File

@ -38,7 +38,7 @@ class LifespanOn:
self.startup_event = asyncio.Event()
self.shutdown_event = asyncio.Event()
self.receive_queue: Queue[LifespanReceiveMessage] = asyncio.Queue()
self.error_occured = False
self.error_occurred = False
self.startup_failed = False
self.shutdown_failed = False
self.should_exit = False
@ -55,21 +55,21 @@ class LifespanOn:
await self.receive_queue.put(startup_event)
await self.startup_event.wait()
if self.startup_failed or (self.error_occured and self.config.lifespan == "on"):
if self.startup_failed or (self.error_occurred and self.config.lifespan == "on"):
self.logger.error("Application startup failed. Exiting.")
self.should_exit = True
else:
self.logger.info("Application startup complete.")
async def shutdown(self) -> None:
if self.error_occured:
if self.error_occurred:
return
self.logger.info("Waiting for application shutdown.")
shutdown_event: LifespanShutdownEvent = {"type": "lifespan.shutdown"}
await self.receive_queue.put(shutdown_event)
await self.shutdown_event.wait()
if self.shutdown_failed or (self.error_occured and self.config.lifespan == "on"):
if self.shutdown_failed or (self.error_occurred and self.config.lifespan == "on"):
self.logger.error("Application shutdown failed. Exiting.")
self.should_exit = True
else:
@ -86,7 +86,7 @@ class LifespanOn:
await app(scope, self.receive, self.send)
except BaseException as exc:
self.asgi = None
self.error_occured = True
self.error_occurred = True
if self.startup_failed or self.shutdown_failed:
return
if self.config.lifespan == "auto":