Deuxfleurs/garage
34
65
Fork 83
Code Issues 95 Pull requests 16 Releases 32 Wiki Activity

Ran rustfmt
Some checks are pending
ci/woodpecker/pr/debug Pipeline is pending approval
Details

Browse source
This commit is contained in:
Brian Picciano 2025-03-20 22:26:53 +01:00
parent e99d6b460e
commit 5eabd64ca7
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/rpc/system.rs
View file

@ -225,7 +225,7 @@ pub fn gen_node_key(metadata_dir: &Path) -> Result<NodeKey, Error> {
use std::os::unix::fs::PermissionsExt; use std::os::unix::fs::PermissionsExt;
let mut perm = f.metadata()?.permissions(); let mut perm = f.metadata()?.permissions();
perm.set_mode(0o600); perm.set_mode(0o600);
std::fs::set_permissions(key_file.as_path(), perm)?; std::fs::set_permissions(key_file.as_path(), perm)?;
} }
#[cfg(windows)] #[cfg(windows)]
@ -813,7 +813,7 @@ impl NodeStatus {
} }
} }
#[cfg(not(windows))] #[cfg(not(windows))]
fn update_disk_usage(&mut self, meta_dir: &Path, data_dir: &DataDirEnum) { fn update_disk_usage(&mut self, meta_dir: &Path, data_dir: &DataDirEnum) {
use nix::sys::statvfs::statvfs; use nix::sys::statvfs::statvfs;
@ -876,10 +876,10 @@ impl NodeStatus {
}; };
} }
#[cfg(windows)] #[cfg(windows)]
fn update_disk_usage(&mut self, _meta_dir: &Path, _data_dir: &DataDirEnum) { fn update_disk_usage(&mut self, _meta_dir: &Path, _data_dir: &DataDirEnum) {
// TODO(mediocregopher): update disk usage on windows, only used for metrics // TODO(mediocregopher): update disk usage on windows, only used for metrics
} }
} }
/// Obtain the list of currently available IP addresses on all non-loopback /// Obtain the list of currently available IP addresses on all non-loopback
@ -894,7 +894,7 @@ fn get_default_ip(filter_ipnet: Option<ipnet::IpNet>) -> Option<IpAddr> {
#[cfg(not(windows))] #[cfg(not(windows))]
{ {
pnet_datalink::interfaces() pnet_datalink::interfaces()
.into_iter() .into_iter()
// filter down and loopback interfaces // filter down and loopback interfaces
.filter(|i| i.is_up() && !i.is_loopback()) .filter(|i| i.is_up() && !i.is_loopback())
@ -902,7 +902,8 @@ fn get_default_ip(filter_ipnet: Option<ipnet::IpNet>) -> Option<IpAddr> {
.flat_map(|e| e.ips) .flat_map(|e| e.ips)
// optionally, filter to be inside filter_ipnet // optionally, filter to be inside filter_ipnet
.find(|ipn| { .find(|ipn| {
filter_ipnet.is_some_and(|ipnet| ipnet.contains(&ipn.ip())) || filter_ipnet.is_none() filter_ipnet.is_some_and(|ipnet| ipnet.contains(&ipn.ip()))
|| filter_ipnet.is_none()
}) })
.map(|ipn| ipn.ip()) .map(|ipn| ipn.ip())
} }

4
src/web/web_server.rs
View file

@ -18,10 +18,10 @@ use opentelemetry::{
use crate::error::*; use crate::error::*;
use garage_api_common::generic_server::server_loop;
use garage_api_common::cors::{ use garage_api_common::cors::{
add_cors_headers, find_matching_cors_rule, handle_options_for_bucket, add_cors_headers, find_matching_cors_rule, handle_options_for_bucket,
}; };
use garage_api_common::generic_server::server_loop;
use garage_api_common::helpers::*; use garage_api_common::helpers::*;
use garage_api_s3::error::{ use garage_api_s3::error::{
CommonErrorDerivative, Error as ApiError, OkOrBadRequest, OkOrInternalError, CommonErrorDerivative, Error as ApiError, OkOrBadRequest, OkOrInternalError,
@ -103,10 +103,10 @@ impl WebServer {
#[cfg(not(windows))] #[cfg(not(windows))]
UnixOrTCPSocketAddress::UnixSocket(ref path) => { UnixOrTCPSocketAddress::UnixSocket(ref path) => {
use garage_api_common::generic_server::UnixListenerOn;
use std::fs::{self, Permissions}; use std::fs::{self, Permissions};
use std::os::unix::prelude::PermissionsExt; use std::os::unix::prelude::PermissionsExt;
use tokio::net::UnixListener; use tokio::net::UnixListener;
use garage_api_common::generic_server::UnixListenerOn;
if path.exists() { if path.exists() {
fs::remove_file(path)? fs::remove_file(path)?