mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

node: Restrict use of systemd to Linux not Unix 

Building with Zigbuild for macOS caused build issues. Strengthen the
condition for using systemd from the Unix family to Linux specifically.
This commit is contained in:
Lorenz Leutgeb 2025-08-12 11:05:28 +02:00
parent 11d29b280a
commit 944d394247
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/radicle-node/Cargo.toml
View File

@ -39,7 +39,6 @@ radicle-fetch = { workspace = true }
radicle-git-ext = { workspace = true, features = ["serde"] } radicle-git-ext = { workspace = true, features = ["serde"] }
radicle-protocol = { workspace = true } radicle-protocol = { workspace = true }
radicle-signals = { workspace = true } radicle-signals = { workspace = true }
radicle-systemd = { workspace = true, optional = true }
sqlite = { workspace = true, features = ["bundled"] } sqlite = { workspace = true, features = ["bundled"] }
scrypt = { version = "0.11.0", default-features = false } scrypt = { version = "0.11.0", default-features = false }
serde = { workspace = true, features = ["derive"] } serde = { workspace = true, features = ["derive"] }
@ -49,6 +48,9 @@ socket2 = "0.5.7"
tempfile = { workspace = true } tempfile = { workspace = true }
thiserror = { workspace = true } thiserror = { workspace = true }
[target.'cfg(target_os = "linux")'.dependencies]
radicle-systemd = { workspace = true, optional = true }
[dev-dependencies] [dev-dependencies]
qcheck = { workspace = true } qcheck = { workspace = true }
qcheck-macros = { workspace = true } qcheck-macros = { workspace = true }
@ -56,4 +58,4 @@ radicle = { workspace = true, features = ["test"] }
radicle-protocol = { workspace = true, features = ["test"] } radicle-protocol = { workspace = true, features = ["test"] }
radicle-crypto = { workspace = true, features = ["test", "cyphernet"] } radicle-crypto = { workspace = true, features = ["test", "cyphernet"] }
snapbox = { workspace = true } snapbox = { workspace = true }
test-log = "0.2.18" test-log = "0.2.18"

13
crates/radicle-node/src/main.rs
View File

@ -93,10 +93,15 @@ fn execute() -> anyhow::Result<()> {
let level = options.log.unwrap_or(config.node.log); let level = options.log.unwrap_or(config.node.log);
let logger = { let logger = {
let journal = if cfg!(all(feature = "systemd", target_family = "unix")) { let journal = {
radicle_systemd::journal::logger::<&str, &str, _>("radicle-node".to_string(), [])? #[cfg(all(feature = "systemd", target_os = "linux"))]
} else { {
None radicle_systemd::journal::logger::<&str, &str, _>("radicle-node".to_string(), [])?
}
#[cfg(not(all(feature = "systemd", target_os = "linux")))]
{
None
}
}; };
if let Some(logger) = journal { if let Some(logger) = journal {

4
crates/radicle-node/src/runtime.rs
View File

@ -344,7 +344,7 @@ impl Runtime {
Ok(()) Ok(())
} }
#[cfg(all(feature = "systemd", target_family = "unix"))] #[cfg(all(feature = "systemd", target_os = "linux"))]
fn receive_listener() -> Option<UnixListener> { fn receive_listener() -> Option<UnixListener> {
use std::os::fd::FromRawFd; use std::os::fd::FromRawFd;
match radicle_systemd::listen::fd("control") { match radicle_systemd::listen::fd("control") {
@ -371,7 +371,7 @@ impl Runtime {
} }
fn bind(path: PathBuf) -> Result<ControlSocket, Error> { fn bind(path: PathBuf) -> Result<ControlSocket, Error> {
#[cfg(all(feature = "systemd", target_family = "unix"))] #[cfg(all(feature = "systemd", target_os = "linux"))]
{ {
if let Some(listener) = Self::receive_listener() { if let Some(listener) = Self::receive_listener() {
log::info!(target: "node", "Received control socket."); log::info!(target: "node", "Received control socket.");