From 0410f69b711a352339ffec2ba505dae69dd8d336 Mon Sep 17 00:00:00 2001 From: Brian Pearce Date: Thu, 28 Nov 2024 14:17:36 +0100 Subject: [PATCH] chore: version bump v0.8.2 (#1149) Description --- Onward and upward! --------- Co-authored-by: stringhandler --- .updater/latest.json | 20 ++++++++++---------- package-lock.json | 4 ++-- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/src/process_watcher.rs | 20 ++++++++++---------- src-tauri/tauri.conf.json | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.updater/latest.json b/.updater/latest.json index 75f646cff..2a3ba89f4 100644 --- a/.updater/latest.json +++ b/.updater/latest.json @@ -1,23 +1,23 @@ { - "version": "0.7.7", + "version": "0.8.0", "notes": "Tari Universe - See the assets to download this version and install", - "pub_date": "2024-11-24T09:24:28.921Z", + "pub_date": "2024-11-27T10:01:00.519Z", "platforms": { "linux-x86_64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFpzN05JN3FFRUdxYlZKNjlXa0NLYUVHdFNIQmJQUitiTkRsWW9vTHc4MVpRdGlPUFRDNkdOZkFES3pIQ2ZtQ2VRUmtrNVdiOUY4aW5mWE14N3pJUUFVPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMyNDM5MTU3CWZpbGU6dGFyaS11bml2ZXJzZV8wLjcuN19hbWQ2NC5BcHBJbWFnZS50YXIuZ3oKeXZ4enFaTEcxSHV0TXpkaVJFODJTSHRVVStGRmQ2bEpyM281aEtpNHFDejgyVHV4T1pBZmRDSFdMU2dOWnNNU2hqTkN4ZFQrYVg3Q2RoWkVUMjFlQ2c9PQo=", - "url": "https://github.com/tari-project/universe/releases/download/v0.7.7/tari-universe_0.7.7_amd64.AppImage.tar.gz" + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFJ3cnBwbkVPODFaMGxzMStWaFdUWUcxTmt1YS9qa29vSWJaSTloZlVIMmNLaU01MUtmLzRJWU41ZWFRZTQrSXRXMEV2T0RId3VSSFRBY3gwanJ6d1E4PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMyNzAwNTUzCWZpbGU6dGFyaS11bml2ZXJzZV8wLjguMF9hbWQ2NC5BcHBJbWFnZS50YXIuZ3oKdTIreGlXSFMrRGhFZVArWTZXaTV4VkxyWFZHYmswS0gyOFRrK3FwS0twK2RuWmRucVp2WThRQ1Vma0l0L2JEeWZiNlk2cVlwbXJEWTRsaFlGMUMrREE9PQo=", + "url": "https://github.com/tari-project/universe/releases/download/v0.8.0/tari-universe_0.8.0_amd64.AppImage.tar.gz" }, "darwin-aarch64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFlZOEZ4ckt1Skt4MzdhNnB5aVpSdmw0emNhem9NQkd4ck9jSUVTRndrUkRVcEt2eFRxVWZBRERDdlFZUHM4eGhLUUNOMEZrdVZsVG9wcmFpRzdHWmdBPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMyNDM5NjE1CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClFJYjViNWxRcitWcmQ1ZW5MdmVPeDRkbGJ2ODBKWGMrbGRKSW5JUFNuNXR0RHJYczEvclI2L0VqVWdhZ2ZsemJocjdjVWxHdVpkRFo2cWhidnRPaUNRPT0K", - "url": "https://github.com/tari-project/universe/releases/download/v0.7.7/Tari.Universe_universal.app.tar.gz" + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFo3Vy9DUktZMnpEclJpYzNDVXNHQmpnZS9MRVI4M01ibm9obnVmSEVZSHVEbXpiSWRWSTBFZDFUeUhxZ2trYk83M3hIQ1VUUDdvUTBiQlhwZnBMNmdZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMyNzAxMzk3CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClJmZW9uQmlaUFhsU0VtcEx0R2p4dTB6SWRhTW56YWJYWWR0eW5MTVRIRU42S1puazJLZUlCbVpKQlBIeGs4WkhSVzAyZUhLRm1ZeWRvSnREQ0dxRUNBPT0K", + "url": "https://github.com/tari-project/universe/releases/download/v0.8.0/Tari.Universe_universal.app.tar.gz" }, "darwin-x86_64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFlZOEZ4ckt1Skt4MzdhNnB5aVpSdmw0emNhem9NQkd4ck9jSUVTRndrUkRVcEt2eFRxVWZBRERDdlFZUHM4eGhLUUNOMEZrdVZsVG9wcmFpRzdHWmdBPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMyNDM5NjE1CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClFJYjViNWxRcitWcmQ1ZW5MdmVPeDRkbGJ2ODBKWGMrbGRKSW5JUFNuNXR0RHJYczEvclI2L0VqVWdhZ2ZsemJocjdjVWxHdVpkRFo2cWhidnRPaUNRPT0K", - "url": "https://github.com/tari-project/universe/releases/download/v0.7.7/Tari.Universe_universal.app.tar.gz" + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFo3Vy9DUktZMnpEclJpYzNDVXNHQmpnZS9MRVI4M01ibm9obnVmSEVZSHVEbXpiSWRWSTBFZDFUeUhxZ2trYk83M3hIQ1VUUDdvUTBiQlhwZnBMNmdZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMyNzAxMzk3CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClJmZW9uQmlaUFhsU0VtcEx0R2p4dTB6SWRhTW56YWJYWWR0eW5MTVRIRU42S1puazJLZUlCbVpKQlBIeGs4WkhSVzAyZUhLRm1ZeWRvSnREQ0dxRUNBPT0K", + "url": "https://github.com/tari-project/universe/releases/download/v0.8.0/Tari.Universe_universal.app.tar.gz" }, "windows-x86_64": { - "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFhaWjJvS3pUUy93WkNpUUN5djZWUWNnSEJEWEVBSHp0SUt0ZVNhTkNLck9RazRxVmo2YTFtNjRTSTRsTXY1SDBKTjBZV1ZUWWprUktWR0MrRGxCQXdVPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMyNDQwMjY0CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjcuN194NjRfZW4tVVMubXNpLnppcAowSDlUVFVQVi9PNUFQRnhCbUhJTkdnMVduZFQzM1RjRVdrR0RwNG5NZlFucXRTbC9TMDVhYzZ3WXRQcTlYYUJTUkxJd1pJeGNrSVpkcmZTeCtBSDRCZz09Cg==", - "url": "https://github.com/tari-project/universe/releases/download/v0.7.7/Tari.Universe_0.7.7_x64_en-US.msi.zip" + "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFg0d253Tk92SXR1Z1lGZW14cGplU1JJUlJZalpjall1dEtWVHNBMDBZN3FwWjRZQi93M2tNK2k3OXlDUUQzbG14MXhhcUZQVXJNZ2VzYWxHTkhDakFzPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMyNzAxNjU0CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMF94NjRfZW4tVVMubXNpLnppcApFR0EwMnNvZ1ovdFRSTnFHNGN4OWlqa3p1TVhRSVN4elFPRlcyWm9sem8zQ3IzWnJKeUtkSTdFbm0vMWZyZmpFMGZnbnJOS1Vyc1RGUkxLekczRFZBUT09Cg==", + "url": "https://github.com/tari-project/universe/releases/download/v0.8.0/Tari.Universe_0.8.0_x64_en-US.msi.zip" } } } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 513506256..b6ba8e3e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tari-universe", - "version": "0.8.1", + "version": "0.8.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "tari-universe", - "version": "0.8.1", + "version": "0.8.2", "dependencies": { "@floating-ui/react": "^0.26.28", "@sentry/react": "^8.38.0", diff --git a/package.json b/package.json index 4d55ba232..b9b43bcb5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tari-universe", "private": true, - "version": "0.8.1", + "version": "0.8.2", "type": "module", "scripts": { "dev": "vite dev --mode development", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 6322e58e8..6af62eb33 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -6630,7 +6630,7 @@ dependencies = [ [[package]] name = "tari-universe" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 7bb80c0fb..7e9cc5a7c 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -4,7 +4,7 @@ description = "Tari Universe" edition = "2021" name = "tari-universe" repository = "https://github.com/tari-project/universe" -version = "0.8.1" +version = "0.8.2" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src-tauri/src/process_watcher.rs b/src-tauri/src/process_watcher.rs index 823bea471..09602cc4c 100644 --- a/src-tauri/src/process_watcher.rs +++ b/src-tauri/src/process_watcher.rs @@ -95,14 +95,10 @@ impl ProcessWatcher { _ = watch_timer.tick() => { let status_monitor3 = status_monitor2.clone(); - let exit_code = do_health_check(&mut child, status_monitor3, name.clone(), &mut uptime, expected_startup_time, health_timeout, app_shutdown.clone(), inner_shutdown.clone(), &mut warning_count).await?; + let exit_code = do_health_check(&mut child, status_monitor3, name.clone(), &mut uptime, expected_startup_time, health_timeout, app_shutdown.clone(), inner_shutdown.clone(), &mut warning_count, &stop_on_exit_codes).await?; if exit_code != 0 { - if stop_on_exit_codes.contains(&exit_code) { - return Ok(exit_code); - } - warn!(target: LOG_TARGET, "{} exited with error code: {}, restarting because it is not a listed exit code to list for", name, exit_code); - - } + return Ok(exit_code); + } // break; }, _ = inner_shutdown.wait() => { @@ -159,6 +155,7 @@ async fn do_health_check( app_shutdown: ShutdownSignal, inner_shutdown: ShutdownSignal, warning_count: &mut u32, + stop_on_exit_codes: &[i32], ) -> Result { let mut is_healthy = false; @@ -209,9 +206,12 @@ async fn do_health_check( match child.stop().await { Ok(exit_code) => { if exit_code != 0 { - error!(target: LOG_TARGET, "{} exited with error code: {}", name, exit_code); - // Do not restart on non-zero exit code. This will just keep happening. - return Ok(exit_code); + if stop_on_exit_codes.contains(&exit_code) { + return Ok(exit_code); + } + warn!(target: LOG_TARGET, "{} exited with error code: {}, restarting because it is not a listed exit code to list for", name, exit_code); + + // return Ok(exit_code); } else { info!(target: LOG_TARGET, "{} exited successfully", name); } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 496f024f8..64fa6b7dd 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "Tari Universe (Alpha)", - "version": "0.8.1" + "version": "0.8.2" }, "tauri": { "systemTray": {