Support file descriptor store messages #8
Conversation
cbranch
force-pushed
the
cbranch/notify-with-fds2
branch
from
32b9723 to
6acde97
Compare
|
Missed a clippy lint, this should pass now. |
|
Do you have any opinions on the design choices made here? In particular, the changes added to support passing file descriptors through the notify socket. |
| listen_fdnames: Option<String>, | ||
| ) -> io::Result<impl ExactSizeIterator<Item = (RawFd, String)>> { | ||
| let listen_fdnames = if let Some(names) = listen_fdnames { | ||
| names.split(':').map(|x| x.to_owned()).collect::<Vec<_>>() |
There was a problem hiding this comment.
I'm not super familiar with this functionality, but shouldn't we parse foo::bar as ["foo", "unknown", "bar"] instead of ["foo", "", "bar"]?
There was a problem hiding this comment.
Gentle nudge @cbranch, can you take a look at this? Thanks!
There was a problem hiding this comment.
I verified the behaviour of the libsystemd function and it indeed uses an empty string, though systemd should always provide a non-empty name. I added a comment with a code example for posterity.
|
|
||
| let _guard = Guard; | ||
| fn listen_fds_internal(unset_env: bool) -> io::Result<impl ExactSizeIterator<Item = RawFd>> { |
There was a problem hiding this comment.
Wish I could remember why listen_fds doesn't take unset_env.
| fdstore = ["dep:sendfd"] | ||
|
|
||
| [dependencies] | ||
| sendfd = { version = "0.4", optional = true } |
There was a problem hiding this comment.
Nice, too bad it doesn't support SCM_CREDENTIALS for sd_pid_notify and friends.
cbranch
force-pushed
the
cbranch/notify-with-fds2
branch
from
6acde97 to
03fd22a
Compare
Adds the `notify_with_fds` function and the `NotifyState::FdStore` variant, to support systemd's file descriptor store feature. These are gated behind the 'fdstore' flag along with the dependency required to make it work.
Names can be received for inherited sockets using `listen_fds_with_names` function instead of `listen_fds`. If the file descriptor store is used, the names can be set for stored fds using the `NotifyState::FdName` variant. Named fds can be removed by additionally supplying the `FdStoreRemove` variant.
cbranch
force-pushed
the
cbranch/notify-with-fds2
branch
from
03fd22a to
b80e6eb
Compare
|
For the benefit of notifs: outstanding issues should be resolved, please go ahead and merge/release as you see fit. |
|
Bumping this change - this would be great to get in a minor semver bump if you are ready to create one :) |
|
https://crates.io/crates/sd-notify/0.4.3 is now out, sorry again for my abysmal response times 😔. |
Support for systemd's file descriptor store is added using new NotifyState variants and a new
notify_with_fdsfunction, which passes file descriptors over the NOTIFY_SOCKET. The capability is gated behind a "fdstore" feature to avoid adding dependencies that were not previously required, and no existing API is touched except for the feature-gated NotifyState enum.As stored file descriptors can be named, you should be able to retrieve file descriptors by those names. This is implemented via the new
listen_fds_with_namesfunction, and is also useful if you are using socket activation.