diff options
| author | Alex Auvolat <alex@adnab.me> | 2021-10-19 16:16:10 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2021-10-25 14:21:48 +0200 |
| commit | de4276202ad2be8a2e07f2a6f2f48d9c25cdc32c (patch) | |
| tree | 2e156181891c312c6b64122250ff9b5c25c91bef /src/model | |
| parent | 1b450c4b493dfcb2ee88acbca3ea584beac8eb4b (diff) | |
| download | garage-de4276202ad2be8a2e07f2a6f2f48d9c25cdc32c.tar.gz garage-de4276202ad2be8a2e07f2a6f2f48d9c25cdc32c.zip | |
Improve CLI, adapt tests, update documentation
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/block.rs | 4 | ||||
| -rw-r--r-- | src/model/garage.rs | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/model/block.rs b/src/model/block.rs index a1dcf776..1e04ee58 100644 --- a/src/model/block.rs +++ b/src/model/block.rs @@ -98,7 +98,9 @@ impl BlockManager { .open_tree("block_local_resync_queue") .expect("Unable to open block_local_resync_queue tree"); - let endpoint = system.netapp.endpoint(format!("garage_model/block.rs/Rpc")); + let endpoint = system + .netapp + .endpoint("garage_model/block.rs/Rpc".to_string()); let block_manager = Arc::new(Self { replication, diff --git a/src/model/garage.rs b/src/model/garage.rs index 482c4df7..d12c781f 100644 --- a/src/model/garage.rs +++ b/src/model/garage.rs @@ -57,14 +57,9 @@ impl Garage { info!("Initialize membership management system..."); let system = System::new( network_key, - config.metadata_dir.clone(), background.clone(), replication_mode.replication_factor(), - config.rpc_bind_addr, - config.rpc_public_addr, - config.bootstrap_peers.clone(), - config.consul_host.clone(), - config.consul_service_name.clone(), + &config, ); let data_rep_param = TableShardedReplication { |