Merge branch 'refs/heads/main' into release

tari-project · Aug 8, 2024 · 09eb5c6 · 09eb5c6
2 parents 62e48da + b636986
commit 09eb5c6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -367,12 +367,12 @@ fn main() {
  info!(target: LOG_TARGET, "Updater event: {:?}", updater_event);
  }
  },
- tauri::RunEvent::ExitRequested { api: _, .. } => {
+ tauri::RunEvent::ExitRequested { api: _, .. } | tauri::RunEvent::Exit => {
  // api.prevent_exit();
  info!(target: LOG_TARGET, "App shutdown caught");
  shutdown.trigger();
  // TODO: Find a better way of knowing that all miners have stopped
- sleep(std::time::Duration::from_secs(5));
+ sleep(std::time::Duration::from_secs(3));
  info!(target: LOG_TARGET, "App shutdown complete");
  }
  RunEvent::MainEventsCleared => {

diff --git a/src-tauri/src/xmrig/http_api/mod.rs b/src-tauri/src/xmrig/http_api/mod.rs
@@ -1,4 +1,6 @@
 mod models;
+use log::error;
+const LOG_TARGET: &str = "tari::universe::xmrig::http_api";
 
 pub struct XmrigHttpApiClient {
  url: String,
@@ -28,7 +30,7 @@ impl XmrigHttpApiClient {
  Ok(summary) => summary,
  Err(e) => {
  dbg!(summary);
- eprintln!("Failed to parse xmrig summary: {}", e);
+ error!(target: LOG_TARGET, "Failed to parse xmrig summary: {}", e);
  // Xmrig has a bug where it doesn't return valid json sometimes.
  // https://github.com/xmrig/xmrig/issues/3363
  continue;

diff --git a/src-tauri/src/xmrig/http_api/models.rs b/src-tauri/src/xmrig/http_api/models.rs
@@ -74,10 +74,7 @@ pub struct Connection {
 #[derive(Deserialize, Debug)]
 pub struct Cpu {
  brand: String,
- family: u64,
- model: u64,
- stepping: u64,
- proc_info: u64,
+ // family: u64,
  aes: bool,
  avx2: bool,
  x64: bool,

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
  },
  "package": {
  "productName": "Tari Universe",
- "version": "0.1.23"
+ "version": "0.1.24"
  },
  "tauri": {
  "updater": {