aboutsummaryrefslogtreecommitdiff
path: root/src/server.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2020-04-09 17:32:28 +0200
committerAlex Auvolat <alex@adnab.me>2020-04-09 17:32:28 +0200
commit101444abb3967770ec378ee09f24eb2845dc091d (patch)
tree7bb838659014b47d220b27d95765174f5d0ae2fe /src/server.rs
parent4c1aee42d5032066272a051687ac200e874cc13f (diff)
downloadgarage-101444abb3967770ec378ee09f24eb2845dc091d.tar.gz
garage-101444abb3967770ec378ee09f24eb2845dc091d.zip
Some progress
Diffstat (limited to 'src/server.rs')
-rw-r--r--src/server.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server.rs b/src/server.rs
index 1f1ac2af..c41ee9b7 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -21,7 +21,7 @@ pub struct Garage {
pub table_rpc_handlers: HashMap<String, Box<dyn TableRpcHandler + Sync + Send>>,
- pub version_table: Arc<Table<VersionTable>>,
+ pub object_table: Arc<Table<ObjectTable>>,
}
impl Garage {
@@ -35,25 +35,25 @@ impl Garage {
timeout: DEFAULT_TIMEOUT,
};
- let version_table = Arc::new(Table::new(
- VersionTable{garage: RwLock::new(None)},
+ let object_table = Arc::new(Table::new(
+ ObjectTable{garage: RwLock::new(None)},
system.clone(),
&db,
- "version".to_string(),
+ "object".to_string(),
meta_rep_param.clone()));
let mut garage = Self{
db,
system: system.clone(),
table_rpc_handlers: HashMap::new(),
- version_table,
+ object_table,
};
garage.table_rpc_handlers.insert(
- garage.version_table.name.clone(),
- garage.version_table.clone().rpc_handler());
+ garage.object_table.name.clone(),
+ garage.object_table.clone().rpc_handler());
let garage = Arc::new(garage);
- *garage.version_table.instance.garage.write().await = Some(garage.clone());
+ *garage.object_table.instance.garage.write().await = Some(garage.clone());
garage
}
}