change where args event is added, and use var_os

Author: mikrostew

crates/volta-core/src/monitor.rs

@@ -14,10 +14,8 @@ use crate::event::Event;
 pub fn send_events(command: &str, events: &[Event]) {
     match serde_json::to_string_pretty(&events) {
         Ok(events_json) => {
-            let tempfile_path = match env::var("VOLTA_WRITE_EVENTS_FILE") {
-                Ok(_) => write_events_file(events_json.clone()),
-                Err(_) => None,
-            };
+            let tempfile_path = env::var_os("VOLTA_WRITE_EVENTS_FILE")
+                .and_then(|_| write_events_file(events_json.clone()));
             if let Some(ref mut child_process) = spawn_process(command, tempfile_path) {
                 if let Some(ref mut p_stdin) = child_process.stdin.as_mut() {
                     if let Err(error) = writeln!(p_stdin, "{}", events_json) {

crates/volta-core/src/session.rs

@@ -147,27 +147,33 @@ impl Session {
     }
 
     fn publish_to_event_log(self) {
-        let plugin_res = self
-            .hooks()
+        let Self {
+            project,
+            hooks,
+            mut event_log,
+            ..
+        } = self;
+        let plugin_res = project
+            .get()
+            .and_then(|p| hooks.get(p))
             .map(|hooks| hooks.events().and_then(|e| e.publish.as_ref()));
         match plugin_res {
             Ok(plugin) => {
-                self.event_log.publish(plugin);
+                event_log.add_event_args();
+                event_log.publish(plugin);
             }
             Err(e) => {
                 debug!("Unable to publish event log.\n{}", e);
             }
         }
     }
 
-    pub fn exit(mut self, code: ExitCode) -> ! {
-        self.event_log.add_event_args();
+    pub fn exit(self, code: ExitCode) -> ! {
         self.publish_to_event_log();
         code.exit();
     }
 
-    pub fn exit_tool(mut self, code: i32) -> ! {
-        self.event_log.add_event_args();
+    pub fn exit_tool(self, code: i32) -> ! {
         self.publish_to_event_log();
         exit(code);
     }