Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(iroh): add --start option to CLI commands #1802

Merged
merged 30 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
65c578d
remove get in favor of blob get
dignifiedquire Nov 10, 2023
78a64fc
extract start arguments
dignifiedquire Nov 11, 2023
df3adb8
implement stdout get
dignifiedquire Nov 11, 2023
0e07110
add --start option and add fallback for rpc port occupied
dignifiedquire Nov 11, 2023
927ea91
happy clippy
dignifiedquire Nov 13, 2023
0177826
use strings for data (makes debugging easier)
dignifiedquire Nov 13, 2023
d5b9d6a
fix most cli tests
dignifiedquire Nov 13, 2023
032de47
fix value formatting
dignifiedquire Nov 13, 2023
debab76
improve node start output
dignifiedquire Nov 13, 2023
6dda261
clippy
dignifiedquire Nov 13, 2023
4e77f55
fix cli_provide_addresses test
Frando Nov 14, 2023
a441186
fix: disallow recursive output to STDOUT, and fix cli stdin_to_stdout…
Frando Nov 15, 2023
2ef730c
fix: cli_tree_resume test
Frando Nov 15, 2023
94be4f4
chore: clippy
Frando Nov 15, 2023
7d724d1
refactor: rename commands::repl to commands::console
Frando Nov 15, 2023
18b36d0
fix after rebase
Frando Nov 15, 2023
cdfa33a
chore: clippy
Frando Nov 15, 2023
ddd360d
chore: clippy
Frando Nov 15, 2023
f925af0
refactor: improve code and args for CLI start (#1812)
Frando Nov 16, 2023
70ea071
refactor: small code improvements and cleanups in CLI (#1813)
Frando Nov 16, 2023
d2a8b65
Merge branch 'main' into feat-cli-start
Arqu Nov 16, 2023
88580ef
Merge branch 'main' into feat-cli-start
Frando Nov 17, 2023
9c597bd
fix: fail with error if passing non-existent path to --config
Frando Nov 17, 2023
f6f0c59
debug hack: print derp map on node start
Frando Nov 17, 2023
b176e98
fix: abort on errror
dignifiedquire Nov 17, 2023
82692ea
fix(cli): ensure derp region from the ticket is used
dignifiedquire Nov 17, 2023
a5c6dfd
fixup
dignifiedquire Nov 17, 2023
6f660a0
Merge branch 'main' into feat-cli-start
dignifiedquire Nov 17, 2023
07de2d8
remove debugging
dignifiedquire Nov 17, 2023
0d39ba4
fix(netcheck): do not log shutdown error as error
dignifiedquire Nov 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion iroh-bytes/src/provider.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//! The server side API
use std::fmt::Debug;
use std::path::PathBuf;
use std::sync::Arc;
use std::time::Duration;

Expand Down Expand Up @@ -209,7 +210,7 @@ pub enum DownloadProgress {
/// The size of the entry in bytes.
size: u64,
/// The path to the file where the data is exported.
target: String,
target: PathBuf,
},
/// We have made progress exporting the data.
///
Expand Down
13 changes: 7 additions & 6 deletions iroh-net/src/netcheck/reportgen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -741,18 +741,19 @@ async fn run_probe(
debug!("starting probe");

let (would_help_tx, would_help_rx) = oneshot::channel();
reportstate
if let Err(err) = reportstate
.send(Message::ProbeWouldHelp(
probe.clone(),
derp_node.clone(),
would_help_tx,
))
.await
.map_err(|err| {
error!("Failed to check if probe would help: {err:#}");
err
})
.map_err(|err| ProbeError::AbortSet(err.into(), probe.clone()))?;
{
// this happens on shutdown or if the report is already finished
debug!("Failed to check if probe would help: {err:#}");
return Err(ProbeError::AbortSet(err.into(), probe.clone()));
}

if !would_help_rx.await.map_err(|_| {
ProbeError::AbortSet(
anyhow!("ReportCheck actor dropped sender while waiting for ProbeWouldHelp response"),
Expand Down
Loading
Loading