-
Notifications
You must be signed in to change notification settings - Fork 169
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.
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
Make ServeDir
infallible
#283
Merged
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
davidpdrsn
commented
Jul 12, 2022
Nehliin
approved these changes
Jul 12, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice! this should make things more consistent
jplatte
reviewed
Jul 18, 2022
jplatte
approved these changes
Dec 2, 2022
1 task
leotaku
added a commit
to leotaku/tower-livereload
that referenced
this pull request
Feb 25, 2023
Made possible by tower-rs/tower-http#283
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.
Motivation
Previously
ServeDir
's error type wasio::Error
. That means users usingServeDir
with axum must use.handle_error()
to convert any IO errors into responses:Since
ServeDir
already mapsio::ErrorKind::NotFound
andio::ErrorKind::PermissionDenied
there isn't much you do for error besides returningStatusCode::INTERNAL_SERVER_ERROR
.That is tedious to do and so I think we should make
ServeDir
handle the error internally and change its error type toInfallible
. That would make the axum integration really simple:Solution
<ServeDir as Service<_>>::Error
toInfallible
StatusCode::INTERNAL_SERVER_ERROR
and log the errorServeDir::try_call
which returns a future that maintains the error. That way users can still customize the error if they want.The same was done for
ServeFile
as its just a wrapper aroundServeDir
.Note that this is a breaking change. We shipped the last major 3 months ago so probably fine to do another one but we should consider if there are any other breaking changes we wanna make.