d9e1055 Improve logging — heartwood

Radicle Heartwood Protocol & Stack

Improve logging

Alexis Sellier committed 3 years ago

commit d9e1055067429ab8ba2650c9874dd5fabe8d97f5
parent a5811e43a74043e3bf1e706720bac3ec01b079c4

4 files changed +23 -4

modified radicle-node/src/control.rs

@@ -32,6 +32,8 @@ pub fn listen<H: Handle<Error = client::handle::Error>>(

     for incoming in listener.incoming() {
         match incoming {
             Ok(mut stream) => {
                 log::debug!(target: "control", "Accepted new client on control socket..");
                 if let Err(e) = drain(&stream, &mut handle) {
                     log::debug!(target: "control", "Received {} on control socket", e);

@@ -82,6 +84,8 @@ fn drain<H: Handle<Error = client::handle::Error>>(

     let cmd = line.trim_end();
     log::debug!(target: "control", "Received `{cmd}` on control socket");
     // TODO: refactor to include helper
     match cmd.split_once(' ') {
         Some(("fetch", arg)) => match arg.parse() {

modified radicle-node/src/service.rs

@@ -500,6 +500,12 @@ where

         let remote = result.remote;
         let rid = result.rid;
         let namespaces = result.namespaces;
         log::debug!(
             target: "service",
             "Fetched {rid} {remote} (error={:?})", result.result.as_ref().err()
         );
         let result = match result.result {
             Ok(updated) => {
                 self.reactor.event(Event::RefsFetched {

@@ -523,6 +529,8 @@ where

         };
         if let Some(results) = self.fetch_reqs.get(&rid) {
             log::debug!(target: "service", "Found existing fetch request, sending result..");
             if results
                 .send(FetchResult {
                     rid,

@@ -532,8 +540,13 @@ where

                 })
                 .is_err()
             {
                 log::error!(target: "service", "Error sending fetch result for {rid}..");
                 self.fetch_reqs.remove(&rid);
             } else {
                 log::debug!(target: "service", "Sent fetch result for {rid}..");
             }
         } else {
             log::debug!(target: "service", "No fetch requests found for {rid}..");
         }
         if let Some(session) = self.sessions.get_mut(&remote) {

@@ -547,6 +560,8 @@ where

                     );
                 }
             }
         } else {
             log::debug!(target: "service", "Session not found for {remote}");
         }
     }

modified radicle-node/src/worker.rs

@@ -146,7 +146,7 @@ impl<G: Signer + EcSign + 'static> Worker<G> {

         thread::Builder::new().name(self.name.clone()).spawn(|| {
             for line in BufReader::new(stderr).lines().flatten() {
                 log::error!(target: "worker", "Git: {}", line);
                 log::debug!(target: "worker", "Git: {}", line);
             }
         })?;

modified radicle/src/storage/git.rs

@@ -669,7 +669,7 @@ impl WriteRepository for Repository {

                     return true;
                 }
             }
             log::warn!("Invalid ref `{}` detected; aborting fetch", name);
             log::warn!(target: "storage", "Invalid ref `{}` detected; aborting fetch", name);
             false
         });

@@ -708,11 +708,11 @@ impl WriteRepository for Repository {

         let head_ref = refname!("HEAD");
         let (branch_ref, head) = self.canonical_head()?;
         log::debug!("Setting ref: {} -> {}", &branch_ref, head);
         log::debug!(target: "storage", "Setting ref: {} -> {}", &branch_ref, head);
         self.raw()
             .reference(&branch_ref, *head, true, "set-local-branch (radicle)")?;
         log::debug!("Setting ref: {} -> {}", head_ref, branch_ref);
         log::debug!(target: "storage", "Setting ref: {} -> {}", head_ref, branch_ref);
         self.raw()
             .reference_symbolic(&head_ref, &branch_ref, true, "set-head (radicle)")?;