Radish alpha
r
Radicle CI broker
Radicle
Git (anonymous pull)
Log in to clone via SSH
feat: use trace level for trigger creation logging
Lars Wirzenius committed 1 year ago
commit 660109e72e0351aa2d4ef5efea900479a3027b41
parent 3d942273f9ff93b7edf01cfacf29e04e8b3a2330
2 files changed +20 -12
modified src/logger.rs
@@ -478,6 +478,14 @@ pub fn debug2(msg: String) {
    debug!(kind = %Kind::Debug, "{msg}");
}

+
pub fn trace(msg: &str) {
+
    trace!(kind = %Kind::Debug, "{msg}");
+
}
+

+
pub fn trace2(msg: String) {
+
    trace!(kind = %Kind::Debug, "{msg}");
+
}
+

pub fn error(msg: &str, e: &impl std::error::Error) {
    error!("{msg}: {e}");
    let mut e = e.source();
modified src/msg.rs
@@ -133,7 +133,7 @@ impl<'a> RequestBuilder<'a> {
    /// Create a [`Request::Trigger``] message from a [`crate::ci_event::Civet`].
    pub fn build_trigger_from_ci_event(self) -> Result<Request, MessageError> {
        fn repository(repo: &RepoId, profile: &Profile) -> Result<Repository, MessageError> {
-
            logger::debug2(format!("build trigger: look up repository {repo}"));
+
            logger::trace2(format!("build trigger: look up repository {repo}"));
            let rad_repo = profile.storage.repository(*repo)?;
            let project_info = rad_repo.project()?;
            Ok(Repository {
@@ -151,7 +151,7 @@ impl<'a> RequestBuilder<'a> {
            repo: &RepoId,
            profile: &Profile,
        ) -> Result<EventCommonFields, MessageError> {
-
            logger::debug2(format!("build trigger: create common fields for {repo}"));
+
            logger::trace2(format!("build trigger: create common fields for {repo}"));
            Ok(EventCommonFields {
                version: PROTOCOL_VERSION,
                event_type,
@@ -160,7 +160,7 @@ impl<'a> RequestBuilder<'a> {
        }

        fn author(node: &NodeId, profile: &Profile) -> Result<Author, MessageError> {
-
            logger::debug2(format!("build trigger: look up author {node}"));
+
            logger::trace2(format!("build trigger: look up author {node}"));
            let did = Did::from(*node);
            did_to_author(profile, &did)
        }
@@ -170,7 +170,7 @@ impl<'a> RequestBuilder<'a> {
            tip: Oid,
            base: Oid,
        ) -> Result<Vec<Oid>, radicle_surf::Error> {
-
            logger::debug2(format!("build trigger: look commits {git_repo:?}"));
+
            logger::trace2(format!("build trigger: look commits {git_repo:?}"));
            git_repo
                .history(tip)?
                .take_while(|c| if let Ok(c) = c { c.id != base } else { false })
@@ -182,7 +182,7 @@ impl<'a> RequestBuilder<'a> {
            rad_repo: &radicle::storage::git::Repository,
            patch_id: &PatchId,
        ) -> Result<radicle::cob::patch::Patch, MessageError> {
-
            logger::debug2(format!("build trigger: look patch cob {patch_id}"));
+
            logger::trace2(format!("build trigger: look patch cob {patch_id}"));
            patch::Patches::open(rad_repo)?
                .get(patch_id)?
                .ok_or(MessageError::PatchCob(*patch_id))
@@ -192,7 +192,7 @@ impl<'a> RequestBuilder<'a> {
            patch_cob: &radicle::cob::patch::Patch,
            author: &Author,
        ) -> Result<Vec<Revision>, MessageError> {
-
            logger::debug2(format!("build trigger: look patch revisions by {author:?}"));
+
            logger::trace2(format!("build trigger: look patch revisions by {author:?}"));
            patch_cob
                .revisions()
                .map(|(rid, r)| {
@@ -213,7 +213,7 @@ impl<'a> RequestBuilder<'a> {
            patch_id: &PatchId,
            author: &Author,
        ) -> Result<Oid, MessageError> {
-
            logger::debug2(format!("build trigger: look patch base {patch_id}"));
+
            logger::trace2(format!("build trigger: look patch base {patch_id}"));
            let author_pk = radicle::crypto::PublicKey::from(author.id);
            let (_id, revision) = patch_cob
                .latest_by(&author_pk)
@@ -231,7 +231,7 @@ impl<'a> RequestBuilder<'a> {
                branch,
                tip,
            })) => {
-
                logger::debug("build trigger: branch created");
+
                logger::trace("build trigger: branch created");
                Ok(Request::Trigger {
                    common: common_fields(EventType::Push, repo, profile)?,
                    push: Some(PushEvent {
@@ -251,7 +251,7 @@ impl<'a> RequestBuilder<'a> {
                tip,
                old_tip,
            })) => {
-
                logger::debug("build trigger: branch updated");
+
                logger::trace("build trigger: branch updated");
                let git_repo =
                    radicle_surf::Repository::open(paths::repository(&profile.storage, repo))?;
                let mut commits = commits(&git_repo, *tip, *old_tip)?;
@@ -277,7 +277,7 @@ impl<'a> RequestBuilder<'a> {
                branch,
                tip,
            })) => {
-
                logger::debug("build trigger: branch deleted");
+
                logger::trace("build trigger: branch deleted");
                Ok(Request::Trigger {
                    common: common_fields(EventType::Push, repo, profile)?,
                    push: Some(PushEvent {
@@ -296,7 +296,7 @@ impl<'a> RequestBuilder<'a> {
                patch: patch_id,
                new_tip,
            })) => {
-
                logger::debug("build trigger: patch created");
+
                logger::trace("build trigger: patch created");
                let rad_repo = profile.storage.repository(*repo)?;
                let git_repo =
                    radicle_surf::Repository::open(paths::repository(&profile.storage, repo))?;
@@ -339,7 +339,7 @@ impl<'a> RequestBuilder<'a> {
                patch: patch_id,
                new_tip,
            })) => {
-
                logger::debug("build trigger: patch updated");
+
                logger::trace("build trigger: patch updated");
                let rad_repo = profile.storage.repository(*repo)?;
                let git_repo =
                    radicle_surf::Repository::open(paths::repository(&profile.storage, repo))?;