Radish alpha
r
Radicle CI broker
Radicle
Git (anonymous pull)
Log in to clone via SSH
feat: adjust logging for usefulness, logspam
Lars Wirzenius committed 1 year ago
commit 5e662275b0d43234fefb09fd2a1f9f994ecca28f
parent 6bd555f6d2be55e6a2187f6222168d1d0fd78818
1 file changed +9 -7
modified src/event.rs
@@ -27,7 +27,7 @@
//! let e = Filters::try_from(filters).unwrap();
//! ```

-
use log::{debug, info, trace};
+
use log::{debug, error, info, trace};
use radicle::{
    node::{Event, Handle, NodeId},
    prelude::RepoId,
@@ -107,35 +107,37 @@ impl NodeEventSource {
    /// no more events from this source, or there's an error.
    pub fn event(&mut self) -> Result<Vec<BrokerEvent>, NodeEventError> {
        loop {
-
            trace!("getting next event from local node");
+
            info!("getting next event from local node");
            if let Some(event) = self.events.next() {
-
                trace!("got event from local node: {event:#?}");
+
                info!("got event from local node");
                match event {
                    Ok(event) => {
-
                        trace!("got node event {:#?}", event);
+
                        debug!("got node event {:#?}", event);
                        let mut result = vec![];
                        if let Some(broker_events) = BrokerEvent::from_event(&event) {
                            for e in broker_events {
                                if self.allowed(&e) {
+
                                    info!("allowed event {e:?}");
                                    result.push(e);
                                }
                            }
                            return Ok(result);
                        }
-
                        trace!("got event, but it was not allowed by filter, go to next event");
+
                        info!("got event, but it was not allowed by filter, go to next event");
                    }
                    Err(radicle::node::Error::Io(err))
                        if err.kind() == std::io::ErrorKind::ConnectionReset =>
                    {
-
                        trace!("connection to node control socket broke");
+
                        info!("connection to node control socket broke");
                        return Err(NodeEventError::BrokenConnection);
                    }
                    Err(err) => {
+
                        error!("error reading event from node: {err}");
                        return Err(NodeEventError::Node(err));
                    }
                }
            } else {
-
                trace!("no more node events from control socket: iterator ended");
+
                info!("no more node events from control socket: iterator ended");
                return Ok(vec![]);
            }
        }