Radish alpha
r
rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5
Radicle web interface
Radicle
Git
Windows build fixes
Merged did:key:z6Mkum88...qkxj opened 2 months ago

also needs upstream patch https://github.com/uttarayan21/axum-listener/pull/2

4 files changed +7 -3 2bbb35b2 eaed75b8
modified radicle-httpd/Cargo.lock
@@ -213,9 +213,9 @@ dependencies = [

[[package]]
name = "axum-listener"
-
version = "0.2.0"
+
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b0cd6458a1428aec99bace599e09140ecd60479f81a33f866ec628b2f5d3a793"
+
checksum = "3b570338dee8621ee4930676c32a114e26f2cd8e4df2e1d9156ea99a9e245360"
dependencies = [
 "axum",
 "futures",
modified radicle-httpd/Cargo.toml
@@ -23,7 +23,7 @@ path = "src/main.rs"
[dependencies]
anyhow = { version = "1" }
axum = { version = "0.8.4", default-features = false, features = ["json", "query", "tokio", "http1"] }
-
axum-listener = { version = "0.2.0" }
+
axum-listener = { version = "0.2.2" }
base64 = { version = "0.22.1" }
chrono = { version = "0.4.41", default-features = false, features = ["clock"] }
flate2 = { version = "1" }
modified radicle-httpd/src/lib.rs
@@ -10,6 +10,7 @@ use std::str;
use std::sync::Arc;
use std::time::Duration;

+
#[cfg(unix)]
use tokio::signal::unix::{signal, SignalKind};

use anyhow::Context as _;
@@ -74,6 +75,7 @@ pub async fn run(options: Options) -> anyhow::Result<()> {
    let profile = Arc::new(profile);
    let ctx = api::Context::new(profile.clone(), web_config.clone(), &options);

+
    #[cfg(unix)]
    tokio::spawn(async move {
        let mut sighup = signal(SignalKind::hangup()).expect("Failed to register SIGHUP handler");

@@ -116,6 +118,7 @@ pub async fn run(options: Options) -> anyhow::Result<()> {
                                "{} \"{} {} {:?}\" {} {:?} {}",
                                match info.connect_info.0 {
                                    DualAddr::Tcp(c) => c.to_string(),
+
                                    #[cfg(unix)]
                                    DualAddr::Uds(_) => "unix-socket".into()
                                },
                                info.method,
modified radicle-httpd/src/main.rs
@@ -63,6 +63,7 @@ fn parse_options() -> Result<httpd::Options, lexopt::Error> {
            Long("listen") => {
                let addr: DualAddr = parser.value()?.parse()?;

+
                #[cfg(unix)]
                // Get socket path and remove it if existing
                if let DualAddr::Uds(socket_path) = &addr {
                    if let Some(path) = socket_path.as_pathname() {