From b96f84b894684ed43e281a3aa2f391b424414a84 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 19 Feb 2024 11:24:33 +0100 Subject: [networking-fixes] add option to bind outgoing RPC sockets (fix #638) Thanks to yuka for the original patch. --- src/garage/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/garage') diff --git a/src/garage/main.rs b/src/garage/main.rs index 4d8dcc67..e489fff0 100644 --- a/src/garage/main.rs +++ b/src/garage/main.rs @@ -203,7 +203,7 @@ async fn cli_command(opt: Opt) -> Result<(), Error> { // Generate a temporary keypair for our RPC client let (_pk, sk) = sodiumoxide::crypto::sign::ed25519::gen_keypair(); - let netapp = NetApp::new(GARAGE_VERSION_TAG, network_key, sk); + let netapp = NetApp::new(GARAGE_VERSION_TAG, network_key, sk, None); // Find and parse the address of the target host let (id, addr, is_default_addr) = if let Some(h) = opt.rpc_host { -- cgit v1.2.3 From 182a23cc1207c97922a24182c15e2b228015e8f4 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 20 Feb 2024 14:20:58 +0100 Subject: [peer-metrics] refactor SystemMetrics to hold a reference to System --- src/garage/server.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/garage') diff --git a/src/garage/server.rs b/src/garage/server.rs index 51b06b8e..6323f957 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -162,6 +162,7 @@ pub async fn run_server(config_file: PathBuf, secrets: Secrets) -> Result<(), Er info!("Netapp exited"); // Drop all references so that stuff can terminate properly + garage.system.cleanup(); drop(garage); // Await for all background tasks to end -- cgit v1.2.3