diff options
| author | Alex Auvolat <alex@adnab.me> | 2024-02-20 17:02:44 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2024-02-20 17:02:44 +0100 |
| commit | 643d1aabd8f229545991217faebd09445aa9b523 (patch) | |
| tree | 3a9533543ba44f7f9bdd188e6c9b07e7ea0500cf /src/garage | |
| parent | eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d (diff) | |
| parent | 885405d944f5f54bce12b53cf1d97f1ecd08887e (diff) | |
| download | garage-643d1aabd8f229545991217faebd09445aa9b523.tar.gz garage-643d1aabd8f229545991217faebd09445aa9b523.zip | |
Merge branch 'main' into next-0.10
Diffstat (limited to 'src/garage')
| -rw-r--r-- | src/garage/main.rs | 2 | ||||
| -rw-r--r-- | src/garage/server.rs | 1 |
2 files changed, 2 insertions, 1 deletions
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 { 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 |