Radish alpha
r
Radicle CI broker
Radicle
Git (anonymous pull)
Log in to clone via SSH
feat: log the picked event when processing queue
Lars Wirzenius committed 1 year ago
commit 51a0834b7faeaa3c9fe651519081eb292798566a
parent 69f10e3eb2d3a359f86fc2b1cd49457fd1f18f45
2 files changed +13 -4
modified src/logger.rs
@@ -8,7 +8,13 @@ use radicle::{git::raw::Oid, identity::RepoId};
use slog::{debug, error, info, o, warn, Drain};
use slog_scope::GlobalLoggerGuard;

-
use crate::{ci_event::CiEvent, config::Config, db::QueueId, msg::Request, run::Run};
+
use crate::{
+
    ci_event::CiEvent,
+
    config::Config,
+
    db::{QueueId, QueuedCiEvent},
+
    msg::Request,
+
    run::Run,
+
};

pub fn open() -> GlobalLoggerGuard {
    let logger = slog_json::Json::new(std::io::stderr())
@@ -86,8 +92,11 @@ pub fn queueproc_channel_disconnect() {
    );
}

-
pub fn queueproc_picked_event(id: &QueueId) {
-
    info!(slog_scope::logger(), "picked event from queue: {id}");
+
pub fn queueproc_picked_event(id: &QueueId, event: &QueuedCiEvent) {
+
    info!(
+
        slog_scope::logger(),
+
        "picked event from queue: {id}: {event:#?}"
+
    );
}

pub fn queueproc_remove_event(id: &QueueId) {
modified src/queueproc.rs
@@ -79,7 +79,7 @@ impl QueueProcessor {
        let mut done = false;
        while !done {
            while let Some(qe) = self.pick_event()? {
-
                logger::queueproc_picked_event(qe.id());
+
                logger::queueproc_picked_event(qe.id(), &qe);
                done = self.process_event(qe.event())?;
                self.drop_event(qe.id())?;
                self.run_tx.send(()).map_err(|_| QueueError::NotifyRun)?;