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

Run cargo fmt

Browse source
This commit is contained in:
Joscha 2023-10-21 18:47:06 +02:00
parent de2992ff63
commit 064f5d11ec
3 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/server/recurring/repo.rs
View file

@ -175,7 +175,9 @@ async fn update_refs(conn: &mut SqliteConnection, refs: Vec<Reference>) -> someh
// Add new refs and update existing refs // Add new refs and update existing refs
for reference in refs { for reference in refs {
let name = reference.name.to_string(); let name = reference.name.to_string();
let Some(hash) = reference.peeled else { continue; }; let Some(hash) = reference.peeled else {
continue;
};
let hash = hash.to_string(); let hash = hash.to_string();
sqlx::query!( sqlx::query!(
@ -195,7 +197,9 @@ async fn update_refs(conn: &mut SqliteConnection, refs: Vec<Reference>) -> someh
} }
async fn track_main_branch(conn: &mut SqliteConnection, repo: &Repository) -> somehow::Result<()> { async fn track_main_branch(conn: &mut SqliteConnection, repo: &Repository) -> somehow::Result<()> {
let Some(head) = repo.head_ref()? else { return Ok(()); }; let Some(head) = repo.head_ref()? else {
return Ok(());
};
let name = head.inner.name.to_string(); let name = head.inner.name.to_string();
sqlx::query!("UPDATE refs SET tracked = true WHERE name = ?", name) sqlx::query!("UPDATE refs SET tracked = true WHERE name = ?", name)
.execute(conn) .execute(conn)

8
src/server/workers.rs
View file

@ -103,8 +103,12 @@ impl Workers {
pub fn should_abort_work(&self, name: &str, queue: &[String]) -> bool { pub fn should_abort_work(&self, name: &str, queue: &[String]) -> bool {
// A worker should abort work if... // A worker should abort work if...
let Some(info) = self.workers.get(name) else { return false; }; let Some(info) = self.workers.get(name) else {
let WorkerStatus::Working (run) = &info.status else { return false; }; return false;
};
let WorkerStatus::Working(run) = &info.status else {
return false;
};
// The commit isn't in the queue // The commit isn't in the queue
if !queue.contains(&run.hash) { if !queue.contains(&run.hash) {

8
src/worker.rs
View file

@ -86,13 +86,17 @@ impl Worker {
async fn perform_run(&self, server: &Server) -> bool { async fn perform_run(&self, server: &Server) -> bool {
// Request run // Request run
let guard = server.status_lock.lock().await; let guard = server.status_lock.lock().await;
let Some(run) = self.request_run(server).await else { return false; }; let Some(run) = self.request_run(server).await else {
return false;
};
let run = RunInProgress::new(server.name.clone(), server.server_config, run); let run = RunInProgress::new(server.name.clone(), server.server_config, run);
*server.current_run.lock().unwrap() = Some(run.clone()); *server.current_run.lock().unwrap() = Some(run.clone());
drop(guard); drop(guard);
// Perform run // Perform run
let Some(run) = run.perform(server).await else { return false; }; let Some(run) = run.perform(server).await else {
return false;
};
// Submit run // Submit run
let guard = server.status_lock.lock().await; let guard = server.status_lock.lock().await;