attempts at fixing pipe closing on message received.

F0903 · Sep 6, 2024 · c699e79 · c699e79
1 parent 82197bd
commit c699e79
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 22 deletions.
diff --git a/shared/src/pipe/mod.rs b/shared/src/pipe/mod.rs
@@ -67,10 +67,3 @@ impl<M, S: HandleStreamMode> Pipe<M, S> {
         self.stream.close()
     }
 }
-
-impl<M, S: HandleStreamMode> Drop for Pipe<M, S> {
-    fn drop(&mut self) {
-        LOGGER.debug("Dropping pipe...");
-        self.close().unwrap();
-    }
-}
diff --git a/shared/src/stream/mod.rs b/shared/src/stream/mod.rs
@@ -38,9 +38,3 @@ impl<M: HandleStreamMode> HandleStream<M> {
         Ok(())
     }
 }
-
-impl<M: HandleStreamMode> Drop for HandleStream<M> {
-    fn drop(&mut self) {
-        self.close().unwrap();
-    }
-}
diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -1,6 +1,7 @@
 mod config_error;
 mod state_config;
 
+use autopower_shared::logging::Logger;
 pub use config_error::ConfigError;
 use state_config::StateConfig;
 
@@ -11,6 +12,8 @@ use std::{
     io::{BufReader, BufWriter, Write},
 };
 
+const LOGGER: Logger = Logger::new("power_config", "autopower");
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct PowerConfig {
     wired_config: StateConfig,
@@ -34,12 +37,14 @@ impl Default for PowerConfig {
 
 impl PowerConfig {
     fn get(path: &str) -> Result<Self, ConfigError> {
+        LOGGER.debug("Reading power config...");
         let fs = File::open(path).map_err(|_| ConfigError::CouldNotLoadOrCreate)?;
         let buf = BufReader::new(fs);
         serde_json::from_reader(buf).map_err(|_| ConfigError::CouldNotLoadOrCreate)
     }
 
     fn new(path: &str) -> Result<Self, ConfigError> {
+        LOGGER.debug("Writing new power config...");
         let new_config = PowerConfig::default();
         let fs = File::create(path).map_err(|_| ConfigError::CouldNotLoadOrCreate)?;
         let mut buf = BufWriter::new(fs);

diff --git a/src/notification_provider.rs b/src/notification_provider.rs
@@ -37,10 +37,3 @@ impl NotificationProvider {
         self.pipe.close()
     }
 }
-
-impl Drop for NotificationProvider {
-    fn drop(&mut self) {
-        LOGGER.debug("Dropping notification provider...");
-        self.terminate().unwrap();
-    }
-}
diff --git a/src/services/power_service.rs b/src/services/power_service.rs
@@ -158,9 +158,13 @@ impl PowerService {
         std::thread::spawn(move || {
             match ctrl_code {
                 SERVICE_CONTROL_POWEREVENT => {
+                    LOGGER.debug("Received power event.");
                     me.handle_power_event(data);
                 }
-                SERVICE_CONTROL_STOP => me.handle_stop(),
+                SERVICE_CONTROL_STOP => {
+                    LOGGER.debug("Received stop event.");
+                    me.handle_stop();
+                }
                 x => {
                     LOGGER.debug(format!("Received unknown control code: {}", x));
                 }
@@ -194,18 +198,19 @@ impl WindowsService for PowerService {
             },
         );
 
+        LOGGER.debug("Setting service status to start pending...");
         if let Err(e) = me.set_service_status(SERVICE_START_PENDING, None, None) {
             LOGGER.error(format!("Could not set service status!\n{}", e));
         }
 
+        LOGGER.debug("Setting up notification provider...");
         me.notification_provider = Some(match NotificationProvider::create() {
             Ok(x) => x,
             Err(e) => {
                 LOGGER.error(format!("Could not create notification provider!\n{}", e));
                 panic!();
             }
         });
-        LOGGER.debug("Creation of notification provider successful.");
 
         LOGGER.debug("Registering power setting notification handling...");
         if let Err(e) = RegisterPowerSettingNotification(
@@ -219,6 +224,7 @@ impl WindowsService for PowerService {
             ));
         }
 
+        LOGGER.debug("Creating stop event...");
         me.stop_event = Some(match CreateEventW(None, TRUE, FALSE, None) {
             Ok(x) => x,
             Err(err) => {
@@ -227,6 +233,7 @@ impl WindowsService for PowerService {
             }
         });
 
+        LOGGER.debug("Setting service status to running...");
         if let Err(e) = me.set_service_status(
             SERVICE_RUNNING,
             None,
@@ -248,6 +255,8 @@ impl WindowsService for PowerService {
             .unwrap()
             .terminate()
             .unwrap();
+
+        drop(Box::from_raw(me));
     }
 
     fn get_name() -> &'static str {