Bootstrap socket location from env variable #73
Merged
Conversation
This file contains hidden or 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
hug-dev
reviewed
Feb 16, 2021
src/core/ipc_handler/unix_socket.rs
Outdated
| pub fn new(path: PathBuf, timeout: Option<Duration>) -> Self { | ||
| Handler { path, timeout } | ||
| pub fn new(path: PathBuf, timeout: Option<Duration>) -> Result<Self> { | ||
| if path.exists() { |
There was a problem hiding this comment.
I think you also need to check if path points to a socket as we do in the service, it might be a folder or a regular file:
if path.exists() && fs::metadata(&path)?.file_type().is_socket() {
Ok(...)
} else {
Err(...)
}
src/core/request_client.rs
Outdated
Comment on lines
43
to
51
| } else { | ||
| Ok(RequestClient { | ||
| max_body_size: DEFAULT_MAX_BODY_SIZE, | ||
| ipc_handler: Box::from(unix_socket::Handler::new( | ||
| unix_socket::DEFAULT_SOCKET_PATH.into(), | ||
| Some(ipc_handler::DEFAULT_TIMEOUT), | ||
| )?), | ||
| }) | ||
| } |
There was a problem hiding this comment.
instead of this else branch you could leverage the constructor from URL and do:
let url = env::var("PARSEC_SERVICE_ENDPOINT").or(DEFAULT_SERVICE_ENDPOINT);and only keep the Ok branch.
and have DEFAULT_SERVICE_ENDPOINT as unix:///run/parsec/parsec.sock
There was a problem hiding this comment.
Done. I didn't create a DEFAULT_SERVICE_ENDPOINT mostly because it's not that straight forward to combine two const &str to obtain a new one, so I just stuck to formatting DEFAULT_SOCKET_PATH in
Also, you don't need // after the unix scheme, so unix:/run/parsec/parsec.sock is the corect value.
This commit adds functionality to create a IPC connector from a URL and to bootstrap the IPC handler creation from an environment variable using this new functionality. Signed-off-by: Ionut Mihalcea <[email protected]>
ionut-arm
force-pushed
the
socket-url
branch
from
6b98f53 to
5d5ded7
Compare
hug-dev
approved these changes
Feb 16, 2021
Comment on lines
+44
to
+54
| pub fn new(path: PathBuf, timeout: Option<Duration>) -> Result<Self> { | ||
| if path.exists() | ||
| && std::fs::metadata(&path) | ||
| .map_err(|_| Error::Client(ClientErrorKind::InvalidSocketAddress))? | ||
| .file_type() | ||
| .is_socket() | ||
| { | ||
| Ok(Handler { path, timeout }) | ||
| } else { | ||
| Err(Error::Client(ClientErrorKind::InvalidSocketAddress)) | ||
| } |
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.
This commit adds functionality to create a IPC connector from a URL and
to bootstrap the IPC handler creation from an environment variable using
this new functionality.
Fixes #37