Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-02-24 00:29:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Specify LANG env variable for monero wallet rpc for unix systems

Browse Source 
By specifying the language we can look for a specific string to check if
 monero wallet rpc is ready
This commit is contained in:
rishflab 2021-03-25 19:51:53 +11:00
parent bc902ea63a
commit a3e85526c6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
swap/src/monero/wallet_rpc.rs
View File

@ -8,7 +8,6 @@ use reqwest::Url;
use std::io::ErrorKind; use std::io::ErrorKind;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::process::Stdio; use std::process::Stdio;
use std::time::Duration;
use tokio::fs::{remove_file, OpenOptions}; use tokio::fs::{remove_file, OpenOptions};
use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader}; use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
use tokio::process::{Child, Command}; use tokio::process::{Child, Command};
@ -125,6 +124,7 @@ impl WalletRpc {
tracing::debug!("Starting monero-wallet-rpc on port {}", port); tracing::debug!("Starting monero-wallet-rpc on port {}", port);
let mut child = Command::new(self.exec_path()) let mut child = Command::new(self.exec_path())
.env("LANG", "en_AU.UTF-8")
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.kill_on_drop(true) .kill_on_drop(true)
.arg(match network { .arg(match network {
@ -148,9 +148,18 @@ impl WalletRpc {
let mut reader = BufReader::new(stdout).lines(); let mut reader = BufReader::new(stdout).lines();
#[cfg(not(target_os = "windows"))]
while let Some(line) = reader.next_line().await? {
if line.contains("Starting wallet RPC server") {
break;
}
}
// If we do not hear from the monero_wallet_rpc process for 3 seconds we assume // If we do not hear from the monero_wallet_rpc process for 3 seconds we assume
// it is is ready // it is is ready
while let Ok(line) = tokio::time::timeout(Duration::from_secs(3), reader.next_line()).await #[cfg(target_os = "windows")]
while let Ok(line) =
tokio::time::timeout(std::time::Duration::from_secs(3), reader.next_line()).await
{ {
line?; line?;
} }