diff --git a/.gitignore b/.gitignore index 1b43f17..73077c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /target /work /example_logs +TODO.org diff --git a/src/nix_util/nix_output_stream.rs b/src/nix_util/nix_output_stream.rs index f4789f2..51d84fb 100644 --- a/src/nix_util/nix_output_stream.rs +++ b/src/nix_util/nix_output_stream.rs @@ -583,23 +583,23 @@ pub(crate) enum NixAction { #[derive(Debug, Clone, Serialize, Deserialize)] pub(crate) struct MsgMessage { - level: u8, - msg: String, + pub(crate) level: u8, + pub(crate) msg: String, #[serde(default, skip_serializing_if = "Option::is_none")] - raw_msg: Option, + pub(crate) raw_msg: Option, #[serde(default, skip_serializing_if = "Option::is_none")] - file: Option, + pub(crate) file: Option, #[serde(default, skip_serializing_if = "Option::is_none")] - line: Option, + pub(crate) line: Option, #[serde(default, skip_serializing_if = "Option::is_none")] - column: Option, + pub(crate) column: Option, #[serde(default, skip_serializing_if = "Option::is_none")] - trace: Option>, + pub(crate) trace: Option>, } #[derive(Debug, Clone, Serialize, Deserialize)] diff --git a/src/nix_util/running_build.rs b/src/nix_util/running_build.rs index 481dd11..58e4249 100644 --- a/src/nix_util/running_build.rs +++ b/src/nix_util/running_build.rs @@ -1,6 +1,7 @@ use sqlx::Row; use tokio::process::Child; use tracing::error; +use tracing::info; use crate::Result; use crate::database::db_handle::DbHandle; @@ -110,7 +111,12 @@ impl<'db> RunningBuild<'db> { }; match message { NixAction::Msg(msg_message) => { - // For now we can ignore the messages. + if msg_message.msg.contains("nix log") { + eprintln!("{}", msg_message.msg); + } + // if msg_message.level == 0 { + // eprintln!("{}", msg_message.msg); + // } } NixAction::Start(activity_start_message) => { match activity_start_message { @@ -269,7 +275,7 @@ impl<'db> RunningBuild<'db> { )?; } }; - // self.print_current_status(); + self.print_current_status(); } NixAction::Stop(stop_message) => { let activity = self @@ -277,7 +283,7 @@ impl<'db> RunningBuild<'db> { .get_activity_id(stop_message.id) .map(|activity_id| self.activity_tree.get_mut(&activity_id))?; activity.get_mut_activity().stop(); - // self.print_current_status(); + self.print_current_status(); // println!("{}", serde_json::to_string(&message)?); } NixAction::Result(activity_result_message) => {