-
Notifications
You must be signed in to change notification settings - Fork 271
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
Reimplement the Lock middleware with tokio::sync #427
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
pub use linkerd2_error::Error; | ||
use std::sync::Arc; | ||
|
||
#[derive(Debug)] | ||
pub struct Poisoned(()); | ||
|
||
#[derive(Debug)] | ||
pub struct ServiceError(Arc<Error>); | ||
|
||
// === impl Poisoned === | ||
|
||
impl Poisoned { | ||
pub fn new() -> Self { | ||
Poisoned(()) | ||
} | ||
} | ||
|
||
impl std::fmt::Display for Poisoned { | ||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | ||
write!(f, "poisoned") | ||
} | ||
} | ||
|
||
impl std::error::Error for Poisoned {} | ||
|
||
// === impl ServiceError === | ||
|
||
impl ServiceError { | ||
pub(crate) fn new(e: Arc<Error>) -> Self { | ||
ServiceError(e) | ||
} | ||
|
||
pub fn inner(&self) -> &Error { | ||
self.0.as_ref() | ||
} | ||
} | ||
|
||
impl std::fmt::Display for ServiceError { | ||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | ||
self.0.fmt(f) | ||
} | ||
} | ||
|
||
impl std::error::Error for ServiceError {} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
use super::Lock; | ||
|
||
#[derive(Clone, Debug, Default)] | ||
pub struct LockLayer(()); | ||
|
||
// === impl Layer === | ||
|
||
impl LockLayer { | ||
pub fn new() -> Self { | ||
LockLayer(()) | ||
} | ||
} | ||
|
||
impl<S> tower::layer::Layer<S> for LockLayer { | ||
type Service = Lock<S>; | ||
|
||
fn layer(&self, inner: S) -> Self::Service { | ||
Self::Service::new(inner) | ||
} | ||
} |
Oops, something went wrong.
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.
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.
very minor nit: i believe the
write!
macro can have a small amount of overhead vsFormatter::write_str
when there's no string interpolation to perform. this probably doesn't matter in practice...