Radish alpha
r
Radicle CI broker
Radicle
Git (anonymous pull)
Log in to clone via SSH
feat: add log messages for thread start/end, log exit status in full
Lars Wirzenius committed 1 year ago
commit c16e9b0af76db10569a2bb04eaf17cc9b5ed7360
parent ccb82c8890f7835b120ba44275e8287571d9dba8
1 file changed +27 -12
modified src/logger.rs
@@ -3,7 +3,7 @@
use std::{path::Path, process::ExitStatus, time::Duration};

use clap::ValueEnum;
-
use radicle::{git::Oid, identity::RepoId, node::Event, patch::PatchId};
+
use radicle::{identity::RepoId, node::Event, patch::PatchId};
use serde_json::Value;
use tracing::{debug, error, info, trace, warn, Level};
use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
@@ -401,10 +401,11 @@ pub fn adapter_config(config: &Config) {
    );
}

-
pub fn queueproc_start() {
+
pub fn queueproc_start(concurrent_adapters: usize) {
    info!(
        msg_id = ?Id::QueueProcStart,
        kind = %Kind::Startup,
+
        concurrent_adapters,
        "start thread to process events until a shutdown event"
    );
}
@@ -427,6 +428,22 @@ pub fn queueproc_end(result: &Result<(), QueueError>) {
    }
}

+
pub fn queueproc_start_result_receiver() {
+
    info!(
+
        msg_id = ?Id::QueueProcStart,
+
        kind = %Kind::Startup,
+
        "start thread to process results of CI runs"
+
    );
+
}
+

+
pub fn queueproc_end_result_receiver() {
+
    info!(
+
        msg_id = ?Id::QueueProcStart,
+
        kind = %Kind::Startup,
+
        "end thread to process results of CI runs"
+
    );
+
}
+

pub fn queueproc_channel_disconnect() {
    info!(
        msg_id = ?Id::QueueProcDisconnected,
@@ -482,7 +499,7 @@ pub fn queueproc_picked_event(id: &QueueId, event: &QueuedCiEvent, adapter: &Ada
        ?id,
        ?event,
        ?adapter,
-
        "picked event from queue"
+
        "running adapter on event picked from queue"
    );
}

@@ -513,22 +530,20 @@ pub fn queueproc_processed_event(result: &Result<bool, QueueError>) {
    );
}

-
pub fn queueproc_remove_event(id: &QueueId) {
+
pub fn queueproc_remove_event(event: &QueuedCiEvent) {
    info!(
        msg_id = ?Id::QueueProcRemoveEvent,
        kind = %Kind::Debug,
-
        ?id,
+
        ?event,
        "remove event from queue"
    );
}

-
pub fn queueproc_action_run(rid: &RepoId, oid: &Oid, msg: &str) {
+
pub fn queueproc_action_run(event: &CiEvent) {
    info!(
        msg_id = ?Id::QueueProcActionRun,
        kind = %Kind::Debug,
-
        ?rid,
-
        ?oid,
-
        msg = msg,
+
        ?event,
        "Action: run"
    );
}
@@ -663,7 +678,7 @@ pub fn event_end() {
}

pub fn broker_db(filename: &Path) {
-
    info!(
+
    debug!(
        msg_id = ?Id::BrokerDatabase,
        kind = %Kind::Startup,
        filename = %filename.display(),
@@ -737,11 +752,11 @@ pub fn adapter_stderr_line(line: &str) {
    );
}

-
pub fn adapter_result(exit: i32) {
+
pub fn adapter_result(exit: ExitStatus) {
    debug!(
        msg_id = ?Id::AdapterExitCode,
        kind = %Kind::Debug,
-
        exit_code = exit,
+
        ?exit,
        "adapter exit code"
    );
}