Reference current exe before starting updater and improve logging

Author: aterentic-ethernal

client/src/main.rs

@@ -755,6 +755,7 @@ pub async fn main() -> Result<()> {
 	// spawn a task to watch for ctrl-c signals from user to trigger the shutdown
 	spawn_in_span(shutdown.on_user_signal("User signaled shutdown".to_string()));
 
+	let current_exe = std::env::current_exe()?;
 	let restart = Arc::new(Mutex::new(false));
 	if let Err(error) = run(
 		cfg,
@@ -774,8 +775,8 @@ pub async fn main() -> Result<()> {
 	let reason = shutdown.completed_shutdown().await;
 
 	if *restart.lock().await {
-		info!("Restarting Light Client...");
-		utils::restart();
+		info!("Restarting light client at {}", current_exe.display());
+		utils::restart(current_exe);
 	}
 
 	// we are not logging error here since expectation is

core/src/updater/mod.rs

@@ -223,7 +223,7 @@ pub async fn run(
 				continue;
 			}
 			if started_at.elapsed() >= delay {
-				info!("Updating the Avail Light Client...");
+				info!("Updating light client...");
 
 				let asset = release.target_asset()?;
 
@@ -254,24 +254,24 @@ pub async fn run(
 				})
 				.await?;
 
-				info!("Downloaded new version of the Avail Light Client");
+				info!("Downloaded new version from {}", asset.url);
 
 				let asset_name = asset.target.bin_name();
 
 				// extract to current directory
 				extract_archive(&archive_path, asset_name)?;
 
-				debug!("Extracted new version of the Avail Light Client: {asset_name}");
+				info!("Extracted new version of {asset_name}");
 
 				let bin = current_dir.as_path().join(PathBuf::from(asset_name));
 				self_replace::self_replace(bin)?;
 
-				debug!("Replaced new version of the Avail Light Client");
+				info!("Replaced new version of the light client");
 
 				let mut restart = restart.lock().await;
 				*restart = true;
 
-				let message = "Avail Light Client update is available, stopping...".to_string();
+				let message = "Light client updated, stopping...".to_string();
 				if let Err(error) = shutdown.trigger_shutdown(message) {
 					error!("{error:#}");
 				}

core/src/utils.rs

@@ -18,6 +18,8 @@ use color_eyre::{
 	Result,
 };
 use futures::Future;
+#[cfg(not(target_arch = "wasm32"))]
+use std::path::PathBuf;
 use tokio::task::JoinHandle;
 #[cfg(target_arch = "wasm32")]
 use tokio_with_wasm::alias as tokio;
@@ -204,15 +206,15 @@ pub fn rng() -> rand::rngs::StdRng {
 }
 
 #[cfg(not(target_arch = "wasm32"))]
-pub fn restart() {
-	let current_exe = std::env::current_exe().unwrap();
-
+pub fn restart(current_exe: PathBuf) {
 	#[cfg(unix)]
 	{
 		use std::os::unix::process::CommandExt;
-		_ = std::process::Command::new(current_exe)
+		let error = std::process::Command::new(current_exe)
 			.args(std::env::args().skip(1))
 			.exec();
+		error!("Restarting light client failed: {error}");
+		std::process::exit(1);
 	}
 
 	#[cfg(windows)]