Skip to content

Commit

Permalink
fixes after merge
Browse files Browse the repository at this point in the history
  • Loading branch information
stringhandler committed Oct 14, 2024
1 parent 0582248 commit 7161c32
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src-tauri/src/mm_proxy_adapter.rs
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
use std::fs;
use std::path::PathBuf;
use std::time::Instant;

use crate::binaries::{Binaries, BinaryResolver};
use crate::process_adapter::{
HealthStatus, ProcessAdapter, ProcessInstance, ProcessStartupSpec, StatusMonitor,
};
use crate::utils::file_utils::convert_to_string;
use anyhow::{anyhow, Error};
use async_trait::async_trait;
use log::{debug, warn};
use log::warn;
use reqwest::Client;
use serde_json::json;
use tari_common_types::tari_address::TariAddress;
use tari_shutdown::Shutdown;

const LOG_TARGET: &str = "tari::universe::mm_proxy_adapter";

#[derive(Clone, PartialEq, Default)]
pub(crate) struct MergeMiningProxyConfig {
pub port: u16,
Expand Down
6 changes: 3 additions & 3 deletions src-tauri/src/process_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub fn launch_child_process(
.args(args)
.envs(envs.cloned().unwrap_or_default())
.stdout(std::process::Stdio::null()) // TODO: uncomment, only for testing
.stderr(std::process::Stdio::piped()) // TODO: uncomment, only for testing
.stderr(std::process::Stdio::null()) // TODO: uncomment, only for testing
.kill_on_drop(true)
.spawn()?)
}
Expand All @@ -21,8 +21,8 @@ pub fn launch_child_process(
Ok(tokio::process::Command::new(file_path)
.args(args)
.envs(envs.cloned().unwrap_or_default())
.stdout(std::process::Stdio::piped())
.stderr(std::process::Stdio::piped())
.stdout(std::process::Stdio::null())
.stderr(std::process::Stdio::null())
.kill_on_drop(true)
.creation_flags(PROCESS_CREATION_NO_WINDOW)
.spawn()?)
Expand Down

0 comments on commit 7161c32

Please sign in to comment.