buzzert/Kordophone
Private
Public Access
1
0
Fork 0
Code Packages Activity

Try to resolve daemon hang when changing settings

Browse Source
This commit is contained in:
James Magahern
2025-06-16 19:06:35 -07:00
parent 45aaf55804
commit 9d591dffc5
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kordophoned/src/daemon/mod.rs
View File

@@ -251,13 +251,15 @@ impl Daemon {
} }
Event::UpdateSettings(settings, reply) => { Event::UpdateSettings(settings, reply) => {
let previous_server_url = self.get_settings().await.unwrap_or_default().server_url; let previous_settings = self.get_settings().await.unwrap_or_default();
let previous_server_url = previous_settings.server_url;
self.update_settings(&settings).await.unwrap_or_else(|e| { self.update_settings(&settings).await.unwrap_or_else(|e| {
log::error!(target: target::SETTINGS, "Failed to update settings: {}", e); log::error!(target: target::SETTINGS, "Failed to update settings: {}", e);
}); });
if previous_server_url != settings.server_url { // Only trigger re-sync if both URLs are Some and different, or if one is Some and other is None
if previous_server_url.as_deref() != settings.server_url.as_deref() {
// If the server url has changed, we'll need to do a full re-sync. // If the server url has changed, we'll need to do a full re-sync.
self.delete_all_conversations().await.unwrap_or_else(|e| { self.delete_all_conversations().await.unwrap_or_else(|e| {
log::error!(target: target::SYNC, "Failed to delete all conversations: {}", e); log::error!(target: target::SYNC, "Failed to delete all conversations: {}", e);
@@ -267,12 +269,12 @@ impl Daemon {
self.spawn_conversation_list_sync(); self.spawn_conversation_list_sync();
// Also restart the update monitor. // Also restart the update monitor.
self.update_monitor_command_tx if let Err(e) = self.update_monitor_command_tx
.as_ref() .as_ref()
.unwrap() .unwrap()
.send(UpdateMonitorCommand::Restart) .try_send(UpdateMonitorCommand::Restart) {
.await log::warn!(target: target::UPDATES, "Failed to send restart command to update monitor: {}", e);
.unwrap(); }
} }
reply.send(()).unwrap(); reply.send(()).unwrap();

2
kordophoned/src/daemon/update_monitor.rs
View File

@@ -34,7 +34,7 @@ pub struct UpdateMonitor {
impl UpdateMonitor { impl UpdateMonitor {
pub fn new(database: Arc<Mutex<Database>>, event_sender: Sender<Event>) -> Self { pub fn new(database: Arc<Mutex<Database>>, event_sender: Sender<Event>) -> Self {
let (command_tx, command_rx) = tokio::sync::mpsc::channel(1); let (command_tx, command_rx) = tokio::sync::mpsc::channel(100);
Self { Self {
database, database,
event_sender, event_sender,