Rename runners to workers
This commit is contained in:
parent
78f945647c
commit
6f4793bcf2
20 changed files with 233 additions and 237 deletions
|
|
@ -1,90 +0,0 @@
|
|||
use std::sync::{Arc, Mutex};
|
||||
|
||||
use reqwest::Client;
|
||||
use tokio::sync::mpsc;
|
||||
use tracing::{debug, info_span, warn, Instrument};
|
||||
|
||||
use crate::{
|
||||
config::{Config, RunnerServerConfig},
|
||||
id,
|
||||
shared::{RunnerRequest, RunnerStatus},
|
||||
somehow,
|
||||
};
|
||||
|
||||
use super::coordinator::Coordinator;
|
||||
|
||||
pub struct Server {
|
||||
name: String,
|
||||
config: &'static Config,
|
||||
server_config: &'static RunnerServerConfig,
|
||||
coordinator: Arc<Mutex<Coordinator>>,
|
||||
client: Client,
|
||||
secret: String,
|
||||
}
|
||||
|
||||
impl Server {
|
||||
pub fn new(
|
||||
name: String,
|
||||
config: &'static Config,
|
||||
server_config: &'static RunnerServerConfig,
|
||||
coordinator: Arc<Mutex<Coordinator>>,
|
||||
) -> Self {
|
||||
Self {
|
||||
name,
|
||||
config,
|
||||
server_config,
|
||||
coordinator,
|
||||
client: Client::new(),
|
||||
secret: id::random_runner_secret(),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn run(&mut self) {
|
||||
let (poke_tx, mut poke_rx) = mpsc::unbounded_channel();
|
||||
self.coordinator
|
||||
.lock()
|
||||
.unwrap()
|
||||
.register(self.name.clone(), poke_tx.clone());
|
||||
|
||||
let name = self.name.clone();
|
||||
async {
|
||||
loop {
|
||||
match self.ping().await {
|
||||
Ok(()) => {}
|
||||
Err(e) => warn!("Error talking to server:\n{e:?}"),
|
||||
}
|
||||
|
||||
// Wait for poke or until the ping delay elapses. If we get
|
||||
// poked while pinging the server, this will not wait and we'll
|
||||
// immediately do another ping.
|
||||
let _ = tokio::time::timeout(self.config.runner_ping_delay, poke_rx.recv()).await;
|
||||
|
||||
// Empty queue in case we were poked more than once. This can
|
||||
// happen for example if we get poked multiple times while
|
||||
// pinging the server.
|
||||
while poke_rx.try_recv().is_ok() {}
|
||||
}
|
||||
}
|
||||
.instrument(info_span!("runner", name))
|
||||
.await;
|
||||
}
|
||||
|
||||
async fn ping(&self) -> somehow::Result<()> {
|
||||
debug!("Pinging");
|
||||
let request = RunnerRequest {
|
||||
info: None,
|
||||
secret: self.secret.clone(),
|
||||
status: RunnerStatus::Idle,
|
||||
request_work: false,
|
||||
submit_work: None,
|
||||
};
|
||||
let url = format!("{}api/runner/status", self.server_config.url);
|
||||
self.client
|
||||
.post(url)
|
||||
.basic_auth(&self.config.runner_name, Some(&self.server_config.token))
|
||||
.json(&request)
|
||||
.send()
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue