Преглед изворни кода

wallet: minor cleanup and add extra logging

darkfi пре 2 година
родитељ
комит
6bbfa97791
2 измењених фајлова са 10 додато и 9 уклоњено
  1. 9 9
      bin/darkwallet/src/app.rs
  2. 1 0
      bin/darkwallet/src/main.rs

+ 9 - 9
bin/darkwallet/src/app.rs

@@ -47,12 +47,11 @@ use crate::{
 
 
 #[cfg(target_os = "android")]
 #[cfg(target_os = "android")]
 const CHATDB_PATH: &str = "/data/data/darkfi.darkwallet/chatdb/";
 const CHATDB_PATH: &str = "/data/data/darkfi.darkwallet/chatdb/";
-#[cfg(target_os = "android")]
-//const KING_PATH: &str = "/data/data/darkfi.darkwallet/assets/king.png";
-const KING_PATH: &str = "king.png";
-
 #[cfg(target_os = "linux")]
 #[cfg(target_os = "linux")]
 const CHATDB_PATH: &str = "chatdb";
 const CHATDB_PATH: &str = "chatdb";
+
+#[cfg(target_os = "android")]
+const KING_PATH: &str = "king.png";
 #[cfg(target_os = "linux")]
 #[cfg(target_os = "linux")]
 const KING_PATH: &str = "assets/king.png";
 const KING_PATH: &str = "assets/king.png";
 
 
@@ -201,9 +200,9 @@ impl App {
         self.trigger_redraw().await;
         self.trigger_redraw().await;
 
 
         // Start the backend
         // Start the backend
-        //if let Err(err) = self.darkirc_backend.start(self.sg.clone(), self.ex.clone()).await {
-        //    error!(target: "app", "backend error: {err}");
-        //}
+        if let Err(err) = self.darkirc_backend.start(self.sg.clone(), self.ex.clone()).await {
+            error!(target: "app", "backend error: {err}");
+        }
     }
     }
 
 
     pub fn stop(&self) {
     pub fn stop(&self) {
@@ -792,8 +791,9 @@ impl App {
 
 
 impl Drop for App {
 impl Drop for App {
     fn drop(&mut self) {
     fn drop(&mut self) {
-        debug!(target: "app", "dropping app");
-        self.stop();
+        debug!(target: "app", "Dropping app");
+        // This hangs
+        //self.stop();
     }
     }
 }
 }
 
 

+ 1 - 0
bin/darkwallet/src/main.rs

@@ -336,6 +336,7 @@ impl DarkIrcBackend {
     }
     }
 
 
     async fn stop(&self) {
     async fn stop(&self) {
+        info!(target: "main", "Stopping DarkIRC backend");
         let self_ = self.0.lock().unwrap();
         let self_ = self.0.lock().unwrap();
         let Some(self_) = &*self_ else {
         let Some(self_) = &*self_ else {
             warn!(target: "main", "Backend wasn't started");
             warn!(target: "main", "Backend wasn't started");