3e51c02 feat: make event queue processing use structured log messages — radicle-ci-broker

rad:zwTxygwuz5LDGBq255RA2CbNGrz8

Radicle CI broker

feat: make event queue processing use structured log messages

Lars Wirzenius committed 1 year ago

commit 3e51c02d0487764404c5dd144938e3077fa92ee5
parent e17b467

2 files changed +22 -2

modified src/logger.rs

@@ -153,10 +153,12 @@ enum Id {

     QueueProcEnd,
     QueueProcFilterDecision,
     QueueProcPickedEvent,
     QueueProcProcessingEvent,
     QueueProcProcessedEvent,
     QueueProcQueueLength,
     QueueProcRemoveEvent,
     QueueProcStart,
     QueueProcTrigger,
     TimeoutLineReceiverCheckChild,
     TimeoutLineReceiverChildDisconnected,

@@ -467,6 +469,24 @@ pub fn queueproc_picked_event(id: &QueueId, event: &QueuedCiEvent, adapter: &Ada

     );
 }
 pub fn queueproc_processing_event(event: &CiEvent) {
     info!(
         msg_id = ?Id::QueueProcProcessingEvent,
         kind = %Kind::GotEvent,
         ?event,
         "processing event"
     );
 }
 pub fn queueproc_trigger(result: &Result<Request, QueueError>) {
     info!(
         msg_id = ?Id::QueueProcTrigger,
         kind = %Kind::GotEvent,
         ?result,
         "trigger request result"
     );
 }
 pub fn queueproc_processed_event(result: &Result<bool, QueueError>) {
     info!(
         msg_id = ?Id::QueueProcProcessedEvent,

modified src/queueproc.rs

@@ -238,7 +238,7 @@ impl QueueProcessor {

     }
     fn process_event(&mut self, event: &CiEvent, adapter: &Adapter) -> Result<bool, QueueError> {
         logger::debug2(format!("queproc::process_event: called; event={event:#?}"));
         logger::queueproc_processing_event(event);
         let x = match event {
             CiEvent::V1(CiEventV1::Shutdown) => {
                 logger::queueproc_action_shutdown();

@@ -326,7 +326,7 @@ impl QueueProcessor {

                     .ci_event(event)
                     .build_trigger_from_ci_event()
                     .map_err(|e| QueueError::build_trigger(event, e));
                 logger::debug2(format!("got trigger {trigger:?}"));
                 logger::queueproc_trigger(&trigger);
                 let trigger = trigger?;
                 self.broker
                     .execute_ci(adapter, &trigger, &self.run_tx)