MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-11-28 13:09:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

support Unix sockets (#133)

Browse Source
This commit is contained in:
Scott Lamb
2022-03-09 14:31:47 -08:00
parent ceaef46ea9
commit 4ce3e511b5
4 changed files with 149 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/cmds/run/config.rs
View File

@@ -77,9 +77,9 @@ pub enum AddressConfig {
/// IPv6 address such as `[::]:8080` or `[::1]:8080`.
Ipv6(std::net::SocketAddrV6),
// TODO: /// Unix socket path such as `/var/lib/moonfire-nvr/sock`.
// Unix(PathBuf),
/// Unix socket path such as `/var/lib/moonfire-nvr/sock`.
Unix(PathBuf),
// TODO: SystemdFileDescriptorName(String), see
// https://www.freedesktop.org/software/systemd/man/systemd.socket.html
}

32
server/src/cmds/run/mod.rs
View File

@@ -5,6 +5,7 @@
use crate::cmds::run::config::Permissions;
use crate::streamer;
use crate::web;
use crate::web::accept::Listener;
use base::clock;
use db::{dir, writer};
use failure::{bail, Error, ResultExt};
@@ -12,6 +13,7 @@ use fnv::FnvHashMap;
use hyper::service::{make_service_fn, service_fn};
use log::error;
use log::{info, warn};
use std::net::SocketAddr;
use std::path::Path;
use std::path::PathBuf;
use std::sync::Arc;
@@ -182,6 +184,26 @@ async fn async_run(read_only: bool, config: &ConfigFile) -> Result<i32, Error> {
}
}
fn make_listener(addr: &config::AddressConfig) -> Result<Listener, Error> {
let sa: SocketAddr = match addr {
config::AddressConfig::Ipv4(a) => a.clone().into(),
config::AddressConfig::Ipv6(a) => a.clone().into(),
config::AddressConfig::Unix(p) => {
return Ok(Listener::Unix(
tokio::net::UnixListener::bind(p)
.with_context(|_| format!("unable bind Unix socket {}", p.display()))?,
));
}
};
// Go through std::net::TcpListener to avoid needing async. That's there for DNS resolution,
// but it's unnecessary when starting from a SocketAddr.
let listener = std::net::TcpListener::bind(&sa)
.with_context(|_| format!("unable to bind TCP socket {}", &sa))?;
listener.set_nonblocking(true)?;
Ok(Listener::Tcp(tokio::net::TcpListener::from_std(listener)?))
}
async fn inner(
read_only: bool,
config: &ConfigFile,
@@ -334,14 +356,8 @@ async fn inner(
move |req| Arc::clone(&svc).serve(req)
}))
});
let socket_addr = match b.address {
config::AddressConfig::Ipv4(a) => a.into(),
config::AddressConfig::Ipv6(a) => a.into(),
};
let server = ::hyper::Server::try_bind(&socket_addr)
.with_context(|_| format!("unable to bind to {}", &socket_addr))?
.tcp_nodelay(true)
.serve(make_svc);
let listener = make_listener(&b.address)?;
let server = ::hyper::Server::builder(listener).serve(make_svc);
let server = server.with_graceful_shutdown(shutdown_rx.future());
Ok(tokio::spawn(server))
})