Radish alpha
r
Radicle CI broker
Radicle
Git (anonymous pull)
Log in to clone via SSH
refactor: drop debug logging, to make code easier to grok
Lars Wirzenius committed 1 year ago
commit a216b84bd1b10a2148cc3b8c0b765d0a5ff79d9f
parent 96499aa1baf998573d6ae969b7819454f166af54
1 file changed +0 -19
modified src/msg.rs
@@ -16,7 +16,6 @@ use std::{
    io::{BufRead, BufReader, Read, Write},
};

-
use log::debug;
use serde::{Deserialize, Serialize};
use uuid::Uuid;

@@ -122,11 +121,8 @@ impl<'a> RequestBuilder<'a> {

    /// Create a [`Request::Trigger`] message.
    pub fn build_trigger(self) -> Result<Request, MessageError> {
-
        debug!("build_trigger: called");
        let profile = self.profile.ok_or(MessageError::NoProfile)?;
-
        debug!("build_trigger: got profile");
        let event = self.event.ok_or(MessageError::NoEvent)?;
-
        debug!("build_trigger: got event");

        let (rid, name, oid, old) = match event {
            BrokerEvent::Shutdown => panic!("got shutdown"),
@@ -137,32 +133,23 @@ impl<'a> RequestBuilder<'a> {
                old,
            } => (rid, name, oid, old),
        };
-
        debug!("build_trigger: unpacked event");
        let repository = profile.storage.repository(*rid)?;
-
        debug!("build_trigger: got repository");
        let storage = &profile.storage;
        let repo = radicle_surf::Repository::open(paths::repository(storage, rid))?;
-
        debug!("build_trigger: opened repository");
        let repo_project = repository.project()?;
-
        debug!("build_trigger: got project");
        let repo_identity = repository.identity()?;
-
        debug!("build_trigger: got identity");
        let author = match extract_author(profile, event) {
            Ok(author) => author,
            Err(err) => {
-
                debug!("build_trigger: author lookup failed: {err}");
                return Err(err);
            }
        };
-
        debug!("build_trigger: got author");
        let push_info: Option<PushEvent>;
        let patch_info: Option<PatchEvent>;
        let event_type: EventType;
-
        debug!("build_trigger: checking if patch or push");
        if let Some(parsed_ref) = parse_ref(name) {
            match parsed_ref {
                ParsedRef::Patch(_oid) => {
-
                    debug!("build_trigger: is patch");
                    event_type = EventType::Patch;
                    let patch_id = event.patch_id().ok_or(MessageError::Trigger)?;
                    let patch = patch::Patches::open(&repository)?
@@ -229,7 +216,6 @@ impl<'a> RequestBuilder<'a> {
                    });
                }
                ParsedRef::Push(_branch) => {
-
                    debug!("build_trigger: is push");
                    event_type = EventType::Push;
                    let before_oid: Oid = old.unwrap_or(*oid);
                    let push_commits: Vec<Oid> = repo
@@ -266,7 +252,6 @@ impl<'a> RequestBuilder<'a> {
                },
            };

-
            debug!("build_trigger: return Ok");
            Ok(Request::Trigger {
                common,
                push: push_info,
@@ -368,16 +353,12 @@ fn did_to_author(profile: &Profile, did: &Did) -> Result<Author, MessageError> {
}

fn extract_author(profile: &Profile, event: &BrokerEvent) -> Result<Author, MessageError> {
-
    debug!("extract_author: called");
-
    debug!("extract_author: {event:#?}");
    let nid = match event.nid() {
        Some(nid) => nid,
        None => {
-
            debug!("extract_author: nid lookup failed");
            return Err(MessageError::Trigger);
        }
    };
-
    debug!("extract_author: got nid {nid}");
    did_to_author(profile, &Did::from(nid))
}