Garmelon/tablejohn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mention server in worker log messages

Browse source
This commit is contained in:
Joscha 2023-08-17 17:30:48 +02:00
parent 76ab00c47a
commit b59b4f8463
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/worker.rs
View file

@ -109,7 +109,7 @@ impl Worker {
match server.post_status(true, None).await { match server.post_status(true, None).await {
Ok(response) => response.run, Ok(response) => response.run,
Err(e) => { Err(e) => {
warn!("Error requesting run:\n{e:?}"); warn!("Error requesting run from {}:\n{e:?}", server.name);
None None
} }
} }
@ -119,7 +119,7 @@ impl Worker {
match server.post_status(false, Some(run)).await { match server.post_status(false, Some(run)).await {
Ok(_) => true, Ok(_) => true,
Err(e) => { Err(e) => {
warn!("Error submitting run:\n{e:?}"); warn!("Error submitting run to {}:\n{e:?}", server.name);
false false
} }
} }

2
src/worker/run.rs
View file

@ -85,7 +85,7 @@ impl RunInProgress {
let run = match result { let run = match result {
Ok(outcome) => outcome, Ok(outcome) => outcome,
Err(e) => { Err(e) => {
error!("Error during run:\n{e:?}"); error!("Error during run for {}:\n{e:?}", server.name);
self.log_stderr("Internal error:".to_string()); self.log_stderr("Internal error:".to_string());
self.log_stderr(format!("{e:?}")); self.log_stderr(format!("{e:?}"));
Some(Finished { Some(Finished {

4
src/worker/server.rs
View file

@ -122,7 +122,7 @@ impl Server {
} }
async fn ping(&self) -> somehow::Result<()> { async fn ping(&self) -> somehow::Result<()> {
debug!("Pinging server"); debug!("Pinging {}", self.name);
let guard = self.status_lock.lock().await; let guard = self.status_lock.lock().await;
let response = self.post_status(false, None).await?; let response = self.post_status(false, None).await?;
@ -137,7 +137,7 @@ impl Server {
loop { loop {
match self.ping().await { match self.ping().await {
Ok(()) => {} Ok(()) => {}
Err(e) => warn!("Error talking to server:\n{e:?}"), Err(e) => warn!("Error talking to {}:\n{e:?}", self.name),
} }
tokio::time::sleep(self.config.ping).await; tokio::time::sleep(self.config.ping).await;