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

Allow dependency injection Config and Server #1248

Closed
wants to merge 10 commits into from
Closed

Allow dependency injection Config and Server #1248

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0c6be2b
Allow dependency injection Config and Server
abersheeran Nov 12, 2021
ce2ccd3
fix typo
abersheeran Nov 12, 2021
60031f8
check config before serve
abersheeran Nov 12, 2021
efeb62a
Add serve in __init__.py
abersheeran Nov 15, 2021
eedaa32
Change check in Config
abersheeran Nov 29, 2021
37d81dd
fix run
abersheeran Nov 29, 2021
fd282bc
Try fix tests with macos and linux
abersheeran Nov 29, 2021
12313e1
fix module name
abersheeran Nov 29, 2021
8a82a43
fix tests
abersheeran Nov 29, 2021
dfa9c4b
delete config from parameters
abersheeran Nov 29, 2021
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
4 changes: 2 additions & 2 deletions uvicorn/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from uvicorn.config import Config
from uvicorn.main import Server, main, run
from uvicorn.main import Server, main, run, serve

__version__ = "0.15.0"
__all__ = ["main", "run", "Config", "Server"]
__all__ = ["main", "run", "serve", "Config", "Server"]
6 changes: 5 additions & 1 deletion uvicorn/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,6 @@ def main(

def run(app: typing.Union[ASGIApplication, str], **kwargs: typing.Any) -> None:
config = Config(app, **kwargs)
server = Server(config=config)

if (config.reload or config.workers > 1) and not isinstance(app, str):
logger = logging.getLogger("uvicorn.error")
Expand All @@ -438,6 +437,11 @@ def run(app: typing.Union[ASGIApplication, str], **kwargs: typing.Any) -> None:
)
sys.exit(1)

server = Server(config=config)
serve(config, server)


def serve(config: Config, server: Server) -> None:
abersheeran marked this conversation as resolved.
Show resolved Hide resolved
if config.should_reload:
sock = config.bind_socket()
ChangeReload(config, target=server.run, sockets=[sock]).run()
Expand Down