Deuxfleurs/garage
42
42
Fork 58
Code Issues 80 Pull requests 9 Releases 29 Wiki Activity

Garage v1.0 #683

Merged
lx merged 119 commits from next-0.10 into main 2024-04-10 15:23:13 +00:00
Conversation 0 Commits 119 Files changed 124 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 81cebdd124 - Show all commits

4
src/rpc/system.rs
View file

@ -520,7 +520,7 @@ impl System {
} }
}; };
let hostname = self.local_status.read().unwrap().hostname.clone(); let hostname = self.local_status.read().unwrap().hostname.clone().unwrap();
if let Err(e) = c if let Err(e) = c
.publish_consul_service(self.netapp.id, &hostname, rpc_public_addr) .publish_consul_service(self.netapp.id, &hostname, rpc_public_addr)
.await .await
@ -544,7 +544,7 @@ impl System {
} }
}; };
let hostname = self.local_status.read().unwrap().hostname.clone(); let hostname = self.local_status.read().unwrap().hostname.clone().unwrap();
if let Err(e) = publish_kubernetes_node(k, self.netapp.id, &hostname, rpc_public_addr).await if let Err(e) = publish_kubernetes_node(k, self.netapp.id, &hostname, rpc_public_addr).await
{ {
error!("Error while publishing node to Kubernetes: {}", e); error!("Error while publishing node to Kubernetes: {}", e);