From bd8bed6ad3476df0d0ae28f4097c509dddeae641 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 21 May 2020 20:33:33 +0200 Subject: [PATCH 1/2] convert evaluation filter to easylapin --- ofborg/src/bin/evaluation-filter.rs | 137 +++++++++++++--------------- 1 file changed, 62 insertions(+), 75 deletions(-) diff --git a/ofborg/src/bin/evaluation-filter.rs b/ofborg/src/bin/evaluation-filter.rs index 91d519f..d59f85d 100644 --- a/ofborg/src/bin/evaluation-filter.rs +++ b/ofborg/src/bin/evaluation-filter.rs @@ -1,90 +1,77 @@ -use amqp::Basic; -use ofborg::config; -use ofborg::easyamqp::{self, ChannelExt, ConsumerExt}; -use ofborg::tasks; -use ofborg::worker; - use std::env; +use std::error::Error; +use async_std::task; use tracing::info; -fn main() { - let cfg = config::load(env::args().nth(1).unwrap().as_ref()); +use ofborg::config; +use ofborg::easyamqp::{self, ChannelExt, ConsumerExt}; +use ofborg::easylapin; +use ofborg::tasks; + +fn main() -> Result<(), Box> { ofborg::setup_log(); - info!("Hello, world!"); + let arg = env::args() + .nth(1) + .expect("usage: evaluation-filter "); + let cfg = config::load(arg.as_ref()); - let mut session = easyamqp::session_from_config(&cfg.rabbitmq).unwrap(); - info!("Connected to rabbitmq"); + let conn = easylapin::from_config(&cfg.rabbitmq)?; + let mut chan = task::block_on(conn.create_channel())?; - let mut channel = session.open_channel(1).unwrap(); + chan.declare_exchange(easyamqp::ExchangeConfig { + exchange: "github-events".to_owned(), + exchange_type: easyamqp::ExchangeType::Topic, + passive: false, + durable: true, + auto_delete: false, + no_wait: false, + internal: false, + })?; - channel - .declare_exchange(easyamqp::ExchangeConfig { - exchange: "github-events".to_owned(), - exchange_type: easyamqp::ExchangeType::Topic, - passive: false, - durable: true, - auto_delete: false, + chan.declare_queue(easyamqp::QueueConfig { + queue: "mass-rebuild-check-jobs".to_owned(), + passive: false, + durable: true, + exclusive: false, + auto_delete: false, + no_wait: false, + })?; + + let queue_name = String::from("mass-rebuild-check-jobs"); + chan.declare_queue(easyamqp::QueueConfig { + queue: queue_name.clone(), + passive: false, + durable: true, + exclusive: false, + auto_delete: false, + no_wait: false, + })?; + + chan.bind_queue(easyamqp::BindQueueConfig { + queue: queue_name.clone(), + exchange: "github-events".to_owned(), + routing_key: Some("pull_request.nixos/nixpkgs".to_owned()), + no_wait: false, + })?; + + let handle = chan.consume( + tasks::evaluationfilter::EvaluationFilterWorker::new(cfg.acl()), + easyamqp::ConsumeConfig { + queue: queue_name.clone(), + consumer_tag: format!("{}-evaluation-filter", cfg.whoami()), + no_local: false, + no_ack: false, no_wait: false, - internal: false, - }) - .unwrap(); - - channel - .declare_queue(easyamqp::QueueConfig { - queue: "mass-rebuild-check-jobs".to_owned(), - passive: false, - durable: true, exclusive: false, - auto_delete: false, - no_wait: false, - }) - .unwrap(); + }, + )?; - channel - .declare_queue(easyamqp::QueueConfig { - queue: "mass-rebuild-check-inputs".to_owned(), - passive: false, - durable: true, - exclusive: false, - auto_delete: false, - no_wait: false, - }) - .unwrap(); + info!("Fetching jobs from {}", &queue_name); + task::block_on(handle); - channel - .bind_queue(easyamqp::BindQueueConfig { - queue: "mass-rebuild-check-inputs".to_owned(), - exchange: "github-events".to_owned(), - routing_key: Some("pull_request.nixos/nixpkgs".to_owned()), - no_wait: false, - }) - .unwrap(); - - channel.basic_prefetch(1).unwrap(); - let mut channel = channel - .consume( - worker::new(tasks::evaluationfilter::EvaluationFilterWorker::new( - cfg.acl(), - )), - easyamqp::ConsumeConfig { - queue: "mass-rebuild-check-inputs".to_owned(), - consumer_tag: format!("{}-evaluation-filter", cfg.whoami()), - no_local: false, - no_ack: false, - no_wait: false, - exclusive: false, - }, - ) - .unwrap(); - - channel.start_consuming(); - - info!("Finished consuming?"); - - channel.close(200, "Bye").unwrap(); - info!("Closed the channel"); - session.close(200, "Good Bye"); + drop(conn); // Close connection. info!("Closed the session... EOF"); + Ok(()) } From 8424c32478e408c82ddb26039de5cb4588727b97 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 21 May 2020 20:52:01 +0200 Subject: [PATCH 2/2] add structured logging to evaluation filter --- ofborg/src/tasks/evaluationfilter.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ofborg/src/tasks/evaluationfilter.rs b/ofborg/src/tasks/evaluationfilter.rs index 23b52a8..6735e89 100644 --- a/ofborg/src/tasks/evaluationfilter.rs +++ b/ofborg/src/tasks/evaluationfilter.rs @@ -3,7 +3,7 @@ use crate::ghevent; use crate::message::{evaluationjob, Pr, Repo}; use crate::worker; -use tracing::info; +use tracing::{debug_span, info}; pub struct EvaluationFilterWorker { acl: acl::ACL, @@ -30,6 +30,9 @@ impl worker::SimpleWorker for EvaluationFilterWorker { } fn consumer(&mut self, job: &ghevent::PullRequestEvent) -> worker::Actions { + let span = debug_span!("job", pr = ?job.number); + let _enter = span.enter(); + if !self.acl.is_repo_eligible(&job.repository.full_name) { info!("Repo not authorized ({})", job.repository.full_name); return vec![worker::Action::Ack];