Radish alpha
r
rad:zwTxygwuz5LDGBq255RA2CbNGrz8
Radicle CI broker
Radicle
Git
feat: always log thread start, end, result of queueadd thread
Lars Wirzenius committed 1 year ago
commit 923a4f16373859de21cbb0c23c36f19e9254dce1
parent b73d00d
2 files changed +10 -7
modified src/logger.rs
@@ -17,6 +17,7 @@ use crate::{
    filter::EventFilter,
    msg::Request,
    node_event_source::NodeEventSource,
+
    queueadd::AdderError,
    queueproc::QueueError,
    run::Run,
};
@@ -526,10 +527,11 @@ pub fn queueadd_push_event(event: &CiEvent, id: &QueueId) {
    );
}

-
pub fn queueadd_end() {
+
pub fn queueadd_end(result: &Result<(), AdderError>) {
    debug!(
        msg_id = ?Id::QueueAddEnd,
        kind = %Kind::Debug,
+
        ?result,
        "thread to process events ends"
    );
}
modified src/queueadd.rs
@@ -42,12 +42,15 @@ pub struct QueueAdder {

impl QueueAdder {
    pub fn add_events_in_thread(self) -> JoinHandle<Result<(), AdderError>> {
-
        spawn(move || self.add_events())
+
        spawn(move || {
+
            logger::queueadd_start();
+
            let result = self.add_events();
+
            logger::queueadd_end(&result);
+
            result
+
        })
    }

-
    pub fn add_events(&self) -> Result<(), AdderError> {
-
        logger::queueadd_start();
-

+
    fn add_events(&self) -> Result<(), AdderError> {
        let profile = Profile::load()?;

        let mut source = CiEventSource::new(&profile)?;
@@ -73,8 +76,6 @@ impl QueueAdder {
                }
            }
        }
-

-
        logger::queueadd_end();
        Ok(())
    }