mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve logging

This commit is contained in:
Alexis Sellier 2023-01-28 23:58:16 +01:00
parent a5811e43a7
commit d9e1055067
No known key found for this signature in database
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
radicle-node/src/control.rs
View File

@ -32,6 +32,8 @@ pub fn listen<H: Handle<Error = client::handle::Error>>(
for incoming in listener.incoming() { for incoming in listener.incoming() {
match incoming { match incoming {
Ok(mut stream) => { Ok(mut stream) => {
log::debug!(target: "control", "Accepted new client on control socket..");
if let Err(e) = drain(&stream, &mut handle) { if let Err(e) = drain(&stream, &mut handle) {
log::debug!(target: "control", "Received {} on control socket", e); 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(); let cmd = line.trim_end();
log::debug!(target: "control", "Received `{cmd}` on control socket");
// TODO: refactor to include helper // TODO: refactor to include helper
match cmd.split_once(' ') { match cmd.split_once(' ') {
Some(("fetch", arg)) => match arg.parse() { Some(("fetch", arg)) => match arg.parse() {

15
radicle-node/src/service.rs
View File

@ -500,6 +500,12 @@ where
let remote = result.remote; let remote = result.remote;
let rid = result.rid; let rid = result.rid;
let namespaces = result.namespaces; let namespaces = result.namespaces;
log::debug!(
target: "service",
"Fetched {rid} {remote} (error={:?})", result.result.as_ref().err()
);
let result = match result.result { let result = match result.result {
Ok(updated) => { Ok(updated) => {
self.reactor.event(Event::RefsFetched { self.reactor.event(Event::RefsFetched {
@ -523,6 +529,8 @@ where
}; };
if let Some(results) = self.fetch_reqs.get(&rid) { if let Some(results) = self.fetch_reqs.get(&rid) {
log::debug!(target: "service", "Found existing fetch request, sending result..");
if results if results
.send(FetchResult { .send(FetchResult {
rid, rid,
@ -532,8 +540,13 @@ where
}) })
.is_err() .is_err()
{ {
log::error!(target: "service", "Error sending fetch result for {rid}..");
self.fetch_reqs.remove(&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) { if let Some(session) = self.sessions.get_mut(&remote) {
@ -547,6 +560,8 @@ where
); );
} }
} }
} else {
log::debug!(target: "service", "Session not found for {remote}");
} }
} }

2
radicle-node/src/worker.rs
View File

@ -146,7 +146,7 @@ impl<G: Signer + EcSign + 'static> Worker<G> {
thread::Builder::new().name(self.name.clone()).spawn(|| { thread::Builder::new().name(self.name.clone()).spawn(|| {
for line in BufReader::new(stderr).lines().flatten() { for line in BufReader::new(stderr).lines().flatten() {
log::error!(target: "worker", "Git: {}", line); log::debug!(target: "worker", "Git: {}", line);
} }
})?; })?;

6
radicle/src/storage/git.rs
View File

@ -669,7 +669,7 @@ impl WriteRepository for Repository {
return true; return true;
} }
} }
log::warn!("Invalid ref `{}` detected; aborting fetch", name); log::warn!(target: "storage", "Invalid ref `{}` detected; aborting fetch", name);
false false
}); });
@ -708,11 +708,11 @@ impl WriteRepository for Repository {
let head_ref = refname!("HEAD"); let head_ref = refname!("HEAD");
let (branch_ref, head) = self.canonical_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() self.raw()
.reference(&branch_ref, *head, true, "set-local-branch (radicle)")?; .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() self.raw()
.reference_symbolic(&head_ref, &branch_ref, true, "set-head (radicle)")?; .reference_symbolic(&head_ref, &branch_ref, true, "set-head (radicle)")?;