59ef2c7 feat(src/logger.rs): adjust logging functions for queue processing — radicle-ci-broker

rad:zwTxygwuz5LDGBq255RA2CbNGrz8

Radicle CI broker

feat(src/logger.rs): adjust logging functions for queue processing

Lars Wirzenius committed 6 months ago

commit 59ef2c760ce6ef46101d1d80358047521a9beaba
parent a17ab01

1 file changed +25 -6

modified src/logger.rs

@@ -4,8 +4,8 @@ use std::{path::Path, process::ExitStatus, time::Duration};

 use clap::ValueEnum;
 use serde_json::Value;
 use tracing::{Level, debug, error, info, trace, warn};
 use tracing_subscriber::{EnvFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt};
 use tracing::{debug, error, info, trace, warn, Level};
 use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
 use uuid::Uuid;
 use radicle::{git::Oid, identity::RepoId, node::Event, patch::PatchId};

@@ -165,12 +165,14 @@ enum Id {

     QueueProcDisconnected,
     QueueProcEnd,
     QueueProcFilterDecision,
     QueueProcFinishedRun,
     QueueProcPickedEvent,
     QueueProcProcessingEvent,
     QueueProcProcessedEvent,
     QueueProcQueueLength,
     QueueProcRemoveEvent,
     QueueProcStart,
     QueueProcThreadJoin,
     QueueProcTrigger,
     QueueProcProcessorResult,
     QueueProcWorkerResult,

@@ -493,22 +495,22 @@ pub fn queueproc_predicate_decision(event: &CiEvent, filter: &EventFilter, allow

     );
 }
 pub fn queueproc_picked_event(id: &QueueId, event: &QueuedCiEvent, adapter: &Adapter) {
 pub fn queueproc_picked_event(id: &QueueId, event: &QueuedCiEvent) {
     info!(
         msg_id = ?Id::QueueProcPickedEvent,
         kind = %Kind::GotEvent,
         ?id,
         ?event,
         ?adapter,
         "running adapter on event picked from queue"
         "picked an event from event queue"
     );
 }
 pub fn queueproc_processing_event(event: &CiEvent) {
 pub fn queueproc_processing_event(event: &CiEvent, adapter: &Adapter) {
     info!(
         msg_id = ?Id::QueueProcProcessingEvent,
         kind = %Kind::GotEvent,
         ?event,
         ?adapter,
         "processing event"
     );
 }

@@ -531,6 +533,14 @@ pub fn queueproc_processor_thread_result(result: Result<(), &QueueError>) {

     );
 }
 pub fn queueproc_thread_join() {
     info!(
         msg_id = ?Id::QueueProcThreadJoin,
         kind = %Kind::FinishRun,
         "joining thread failed"
     );
 }
 pub fn queueproc_trigger(result: &Result<Request, QueueError>) {
     info!(
         msg_id = ?Id::QueueProcTrigger,

@@ -558,6 +568,15 @@ pub fn queueproc_remove_event(event: &QueuedCiEvent) {

     );
 }
 pub fn queueproc_finished_run(repoid: &Option<RepoId>) {
     info!(
         msg_id = ?Id::QueueProcFinishedRun,
         kind = %Kind::FinishRun,
         ?repoid,
         "finished run"
     );
 }
 pub fn queueproc_action_run(event: &CiEvent) {
     info!(
         msg_id = ?Id::QueueProcActionRun,