refactor: unify AgentRequest/Response + ManagerRequest/Response into Request/Response (#691)
This commit is contained in:
parent
2fd6de7bab
commit
15617cef9a
6 changed files with 197 additions and 534 deletions
|
|
@ -26,10 +26,7 @@ const BODY_TRUNCATE: usize = 500;
|
|||
/// configured. Otherwise loops forever, polling every
|
||||
/// `POLL_INTERVAL_SECS` seconds. Errors are never fatal.
|
||||
///
|
||||
/// `is_manager`: when true, wakes the inbox via `ManagerRequest::Wake`
|
||||
/// instead of `AgentRequest::Wake` (the manager socket rejects the agent
|
||||
/// request type).
|
||||
pub async fn run(socket: PathBuf, is_manager: bool) {
|
||||
pub async fn run(socket: PathBuf) {
|
||||
let forge_url = match std::env::var("HIVE_FORGE_URL") {
|
||||
Ok(u) if !u.is_empty() => u,
|
||||
_ => {
|
||||
|
|
@ -122,7 +119,6 @@ pub async fn run(socket: PathBuf, is_manager: bool) {
|
|||
&forge_url,
|
||||
&token,
|
||||
&socket,
|
||||
is_manager,
|
||||
keep_subscriptions,
|
||||
&mut unsubbed_repos,
|
||||
&own_login,
|
||||
|
|
@ -623,7 +619,6 @@ async fn poll_once(
|
|||
forge_url: &str,
|
||||
token: &str,
|
||||
socket: &Path,
|
||||
is_manager: bool,
|
||||
keep_subscriptions: bool,
|
||||
unsubbed_repos: &mut HashSet<String>,
|
||||
own_login: &str,
|
||||
|
|
@ -690,23 +685,13 @@ async fn poll_once(
|
|||
continue;
|
||||
};
|
||||
|
||||
let delivered = if is_manager {
|
||||
let req = hive_sh4re::ManagerRequest::Wake {
|
||||
from: "forge".to_owned(),
|
||||
body,
|
||||
};
|
||||
crate::client::request::<_, hive_sh4re::ManagerResponse>(socket, &req)
|
||||
.await
|
||||
.map(|_| ())
|
||||
} else {
|
||||
let req = hive_sh4re::AgentRequest::Wake {
|
||||
from: "forge".to_owned(),
|
||||
body,
|
||||
};
|
||||
crate::client::request::<_, hive_sh4re::AgentResponse>(socket, &req)
|
||||
.await
|
||||
.map(|_| ())
|
||||
let req = hive_sh4re::Request::Wake {
|
||||
from: "forge".to_owned(),
|
||||
body,
|
||||
};
|
||||
let delivered = crate::client::request::<_, hive_sh4re::Response>(socket, &req)
|
||||
.await
|
||||
.map(|_| ());
|
||||
match delivered {
|
||||
Ok(()) => {
|
||||
debug!(%id, "forge_notify: delivered");
|
||||
|
|
|
|||
Loading…
Reference in a new issue