A0: review round 1 peer entry defaults and class strings
This commit is contained in:
1 parent
4bfb097be6
commit
0dbaf58c8c
10 files changed
+276
-32
No files matched your search
+25
-15
@@ -5,8 +5,8 @@ use std::collections::BTreeMap;
|
||||
use std::sync::{Arc, RwLock};
|
||||
use std::time::Duration;
|
||||
|
||||
use crate::config::ConfigError;
|
||||
use crate::error::AppError;
|
||||
use crate::peers::error::PeerConfigError;
|
||||
use crate::peers::transport::{PeerResponse, PeerTransport};
|
||||
use crate::peers::types::{ApiStatus, PeerConfig, PeerName, PeerStatus, PeersConfig, ServerStatus};
|
||||
|
||||
@@ -82,19 +82,21 @@ impl PeerRegistry {
|
||||
}
|
||||
|
||||
pub fn status(&self, name: &str) -> Result<PeerStatus, AppError> {
|
||||
let Ok(key) = PeerName::parse(name) else {
|
||||
return Err(AppError::NotFound(format!("peer {name}: unknown peer")));
|
||||
};
|
||||
lock_read(&self.state)
|
||||
.statuses
|
||||
.values()
|
||||
.find(|s| s.name.as_str() == name)
|
||||
.get(&key)
|
||||
.cloned()
|
||||
.ok_or_else(|| AppError::NotFound(format!("peer {name}: unknown peer")))
|
||||
}
|
||||
|
||||
pub fn contains(&self, name: &str) -> bool {
|
||||
lock_read(&self.state)
|
||||
.statuses
|
||||
.keys()
|
||||
.any(|n| n.as_str() == name)
|
||||
let Ok(key) = PeerName::parse(name) else {
|
||||
return false;
|
||||
};
|
||||
lock_read(&self.state).statuses.contains_key(&key)
|
||||
}
|
||||
|
||||
pub fn config(&self) -> Arc<PeersConfig> {
|
||||
@@ -109,14 +111,10 @@ impl PeerRegistry {
|
||||
query: &[(String, String)],
|
||||
opts: ProxyOpts,
|
||||
) -> Result<PeerResponse, AppError> {
|
||||
let key = PeerName::parse(name).ok();
|
||||
let (peer, timeout) = {
|
||||
let st = lock_read(&self.state);
|
||||
let peer = st
|
||||
.config
|
||||
.peer
|
||||
.iter()
|
||||
.find(|p| p.name.as_str() == name)
|
||||
.cloned();
|
||||
let peer = key.and_then(|key| st.config.peer.iter().find(|p| p.name == key).cloned());
|
||||
(peer, Duration::from_secs(st.config.request_timeout_secs))
|
||||
};
|
||||
let peer = peer.ok_or_else(|| AppError::NotFound(format!("peer {name}: unknown peer")))?;
|
||||
@@ -126,7 +124,7 @@ impl PeerRegistry {
|
||||
/// Replace the peer set. Statuses of peers that survive a reload are kept
|
||||
/// so `since` survives a config change. Validation arrives with the
|
||||
/// config and secrets tasks; this body only swaps state.
|
||||
pub async fn reload(&self, new: PeersConfig) -> Result<(), ConfigError> {
|
||||
pub async fn reload(&self, new: PeersConfig) -> Result<(), PeerConfigError> {
|
||||
let mut st = lock_write(&self.state);
|
||||
let old = std::mem::take(&mut st.statuses);
|
||||
st.statuses = new
|
||||
@@ -191,6 +189,11 @@ mod tests {
|
||||
assert_eq!(err.message(), "peer nope: unknown peer");
|
||||
assert!(reg.contains("beta"));
|
||||
assert!(!reg.contains("nope"));
|
||||
assert!(!reg.contains("Beta"));
|
||||
assert!(!reg.contains("-beta"));
|
||||
let err = reg.status("Beta").unwrap_err();
|
||||
assert_eq!(err.code(), "not_found");
|
||||
assert_eq!(err.message(), "peer Beta: unknown peer");
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -226,6 +229,12 @@ mod tests {
|
||||
.unwrap_err();
|
||||
assert_eq!(err.code(), "not_found");
|
||||
assert_eq!(err.message(), "peer nope: unknown peer");
|
||||
|
||||
let err = reg
|
||||
.get("Beta", "/x", &[], ProxyOpts::default())
|
||||
.await
|
||||
.unwrap_err();
|
||||
assert_eq!(err.message(), "peer Beta: unknown peer");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
@@ -241,7 +250,8 @@ mod tests {
|
||||
}
|
||||
let mut new = fake_peers_config(&["beta", "delta"]);
|
||||
new.peer[0].enabled = false;
|
||||
reg.reload(new).await.unwrap();
|
||||
let reloaded: Result<(), PeerConfigError> = reg.reload(new).await;
|
||||
reloaded.unwrap();
|
||||
|
||||
let snap = reg.snapshot();
|
||||
assert_eq!(snap.len(), 2);
|
||||
|
||||
Reference in new issue
Block a user