Skip to content

Commit 9f01cef

Browse files
committed
Simplify pattern for running servers forever.
1 parent 755eac1 commit 9f01cef

File tree

11 files changed

+22
-22
lines changed

11 files changed

+22
-22
lines changed

README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ Here's an echo server with the ``asyncio`` API:
5454
await websocket.send(message)
5555
5656
async def main():
57-
async with serve(echo, "localhost", 8765):
58-
await asyncio.get_running_loop().create_future() # run forever
57+
async with serve(echo, "localhost", 8765) as server:
58+
await server.serve_forever()
5959
6060
asyncio.run(main())
6161

docs/intro/tutorial1.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ Create an ``app.py`` file next to ``connect4.py`` with this content:
194194
195195
196196
async def main():
197-
async with serve(handler, "", 8001):
198-
await asyncio.get_running_loop().create_future() # run forever
197+
async with serve(handler, "", 8001) as server:
198+
await server.serve_forever()
199199
200200
201201
if __name__ == "__main__":

example/django/authentication.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ async def handler(websocket):
2222

2323

2424
async def main():
25-
async with serve(handler, "localhost", 8888):
26-
await asyncio.get_running_loop().create_future() # run forever
25+
async with serve(handler, "localhost", 8888) as server:
26+
await server.serve_forever()
2727

2828

2929
if __name__ == "__main__":

example/faq/health_check_server.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ async def echo(websocket):
1313
await websocket.send(message)
1414

1515
async def main():
16-
async with serve(echo, "localhost", 8765, process_request=health_check):
17-
await asyncio.get_running_loop().create_future() # run forever
16+
async with serve(echo, "localhost", 8765, process_request=health_check) as server:
17+
await server.serve_forever()
1818

1919
asyncio.run(main())

example/quickstart/counter.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ async def counter(websocket):
4242
broadcast(USERS, users_event())
4343

4444
async def main():
45-
async with serve(counter, "localhost", 6789):
46-
await asyncio.get_running_loop().create_future() # run forever
45+
async with serve(counter, "localhost", 6789) as server:
46+
await server.serve_forever()
4747

4848
if __name__ == "__main__":
4949
asyncio.run(main())

example/quickstart/server.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ async def hello(websocket):
1414
print(f">>> {greeting}")
1515

1616
async def main():
17-
async with serve(hello, "localhost", 8765):
18-
await asyncio.get_running_loop().create_future() # run forever
17+
async with serve(hello, "localhost", 8765) as server:
18+
await server.serve_forever()
1919

2020
if __name__ == "__main__":
2121
asyncio.run(main())

example/quickstart/server_secure.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ async def hello(websocket):
2020
ssl_context.load_cert_chain(localhost_pem)
2121

2222
async def main():
23-
async with serve(hello, "localhost", 8765, ssl=ssl_context):
24-
await asyncio.get_running_loop().create_future() # run forever
23+
async with serve(hello, "localhost", 8765, ssl=ssl_context) as server:
24+
await server.serve_forever()
2525

2626
if __name__ == "__main__":
2727
asyncio.run(main())

example/quickstart/show_time.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ async def show_time(websocket):
1313
await asyncio.sleep(random.random() * 2 + 1)
1414

1515
async def main():
16-
async with serve(show_time, "localhost", 5678):
17-
await asyncio.get_running_loop().create_future() # run forever
16+
async with serve(show_time, "localhost", 5678) as server:
17+
await server.serve_forever()
1818

1919
if __name__ == "__main__":
2020
asyncio.run(main())

example/routing.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ def format_timedelta(delta):
146146

147147

148148
async def main():
149-
async with route(url_map, "localhost", 8888):
150-
await asyncio.get_running_loop().create_future() # run forever
149+
async with route(url_map, "localhost", 8888) as server:
150+
await server.serve_forever()
151151

152152

153153
if __name__ == "__main__":

example/tutorial/step1/app.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ async def handler(websocket):
5757

5858

5959
async def main():
60-
async with serve(handler, "", 8001):
61-
await asyncio.get_running_loop().create_future() # run forever
60+
async with serve(handler, "", 8001) as server:
61+
await server.serve_forever()
6262

6363

6464
if __name__ == "__main__":

example/tutorial/step2/app.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ async def handler(websocket):
182182

183183

184184
async def main():
185-
async with serve(handler, "", 8001):
186-
await asyncio.get_running_loop().create_future() # run forever
185+
async with serve(handler, "", 8001) as server:
186+
await server.serve_forever()
187187

188188

189189
if __name__ == "__main__":

0 commit comments

Comments
 (0)