leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: better handle daemon restarts

Browse source
This commit is contained in:
Ashley Wulber 2023-07-06 12:55:00 -04:00 • committed by Ashley Wulber
parent 94becddc2d
commit 6bb6ee6a92
2 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cosmic-applet-notifications/src/main.rs
View file

@ -183,7 +183,7 @@ impl Application for Notifications {
.min_width(1.0) .min_width(1.0)
.max_width(300.0) .max_width(300.0)
.min_height(100.0) .min_height(100.0)
.max_height(600.0); .max_height(900.0);
get_popup(popup_settings) get_popup(popup_settings)
} }
} }

27
cosmic-applet-notifications/src/subscriptions/notifications.rs
View file

@ -41,12 +41,25 @@ pub fn notifications() -> Subscription<AppletEvent> {
std::thread::spawn(move || -> anyhow::Result<()> { std::thread::spawn(move || -> anyhow::Result<()> {
let mut msg = String::new(); let mut msg = String::new();
std::io::stdin().read_line(&mut msg)?;
let raw_fd = msg.trim().parse::<RawFd>()?; if let Err(err) = std::io::stdin().read_line(&mut msg) {
error!("Failed to read line from panel: {}", err);
anyhow::bail!("Failed to read line from panel");
}
info!("Received fd from panel: {}", msg);
let Ok(raw_fd) = msg.trim().parse::<RawFd>() else {
error!("Failed to parse fd from panel");
anyhow::bail!("Failed to parse fd from panel");
};
if raw_fd == 0 { if raw_fd == 0 {
error!("Invalid fd received from panel");
anyhow::bail!("Invalid fd received from panel"); anyhow::bail!("Invalid fd received from panel");
} }
_ = tx.send(raw_fd); if let Err(err) = tx.send(raw_fd) {
error!("Failed to send fd to main thread: {}", err);
anyhow::bail!("Failed to send fd to main thread");
}
Ok(()) Ok(())
}); });
@ -122,6 +135,10 @@ pub fn notifications() -> Subscription<AppletEvent> {
let mut lines = reader.lines(); let mut lines = reader.lines();
while let Ok(Some(line)) = lines.next_line().await { while let Ok(Some(line)) = lines.next_line().await {
if line.is_empty() {
warn!("Received empty line from notification stream. The notification daemon probably crashed, so we will exit.");
std::process::exit(1);
}
if let Ok(event) = ron::de::from_str::<AppletEvent>(line.as_str()) { if let Ok(event) = ron::de::from_str::<AppletEvent>(line.as_str()) {
if let Err(_err) = output.send(event).await { if let Err(_err) = output.send(event).await {
error!("Error sending event"); error!("Error sending event");
@ -130,8 +147,8 @@ pub fn notifications() -> Subscription<AppletEvent> {
error!("Failed to deserialize event from notification stream"); error!("Failed to deserialize event from notification stream");
} }
} }
warn!("Notification stream closed"); warn!("Notification stream closed. The notification daemon probably crashed, so we will exit.");
state = State::Finished; std::process::exit(1);
} }
State::Finished => { State::Finished => {
let () = futures::future::pending().await; let () = futures::future::pending().await;