Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-09-29 21:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #769

Browse Source 
769: Change message log level to debug to allow enabling through flag r=rishflab a=rishflab

We do not have a way to enable tracing through a command line
argument so it did not make sense to have these messages set to
trace. Ideally a trace flag should be added but it is not that
straightforward with structopt. We could add a --log-level arg
that allows you select a log level but this is verbose.

Closes #759


Co-authored-by: rishflab <rishflab@hotmail.com>
This commit is contained in:
bors[bot] 2021-09-11 23:04:34 +00:00 committed by GitHub
commit e860c051d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- The `cancel`, `refund` and `punish` subcommands in ASB and CLI are run with the `--force` by default and the `--force` option has been removed. - The `cancel`, `refund` and `punish` subcommands in ASB and CLI are run with the `--force` by default and the `--force` option has been removed.
The force flag was used to ignore blockheight and protocol state checks. The force flag was used to ignore blockheight and protocol state checks.
Users can still restart a swap with these checks using the `resume` subcommand. Users can still restart a swap with these checks using the `resume` subcommand.
- Changed log level of the "Advancing state", "Establishing Connection through Tor proxy" and "Connection through Tor established" log message from tracing to debug in the CLI.
### Added ### Added

4
swap/src/network/tor_transport.rs
View File

@ -42,14 +42,14 @@ impl Transport for TorDialOnlyTransport {
} }
let dial_future = async move { let dial_future = async move {
tracing::trace!(address = %addr, "Establishing connection through Tor proxy"); tracing::debug!(address = %addr, "Establishing connection through Tor proxy");
let stream = let stream =
Socks5Stream::connect((Ipv4Addr::LOCALHOST, self.socks_port), address.to_string()) Socks5Stream::connect((Ipv4Addr::LOCALHOST, self.socks_port), address.to_string())
.await .await
.map_err(|e| io::Error::new(io::ErrorKind::ConnectionRefused, e))?; .map_err(|e| io::Error::new(io::ErrorKind::ConnectionRefused, e))?;
tracing::trace!("Connection through Tor established"); tracing::debug!("Connection through Tor established");
Ok(TcpStream(stream.into_inner())) Ok(TcpStream(stream.into_inner()))
}; };

2
swap/src/protocol/bob/swap.rs
View File

@ -58,7 +58,7 @@ async fn next_state(
monero_wallet: &monero::Wallet, monero_wallet: &monero::Wallet,
monero_receive_address: monero::Address, monero_receive_address: monero::Address,
) -> Result<BobState> { ) -> Result<BobState> {
tracing::trace!(%state, "Advancing state"); tracing::debug!(%state, "Advancing state");
Ok(match state { Ok(match state {
BobState::Started { BobState::Started {