talexander/nix_builder
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Log nix messages.

Browse Source
This commit is contained in:
Tom Alexander
2026-03-01 18:02:58 -05:00
parent 7b19e43fce
commit 1f5c080138
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
/target /target
/work /work
/example_logs /example_logs
TODO.org

14
src/nix_util/nix_output_stream.rs
View File

@@ -583,23 +583,23 @@ pub(crate) enum NixAction {
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
pub(crate) struct MsgMessage { pub(crate) struct MsgMessage {
level: u8, pub(crate) level: u8,
msg: String, pub(crate) msg: String,
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
raw_msg: Option<String>, pub(crate) raw_msg: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
file: Option<String>, pub(crate) file: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
line: Option<u64>, pub(crate) line: Option<u64>,
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
column: Option<u64>, pub(crate) column: Option<u64>,
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
trace: Option<Vec<TraceEntry>>, pub(crate) trace: Option<Vec<TraceEntry>>,
} }
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]

12
src/nix_util/running_build.rs
View File

@@ -1,6 +1,7 @@
use sqlx::Row; use sqlx::Row;
use tokio::process::Child; use tokio::process::Child;
use tracing::error; use tracing::error;
use tracing::info;
use crate::Result; use crate::Result;
use crate::database::db_handle::DbHandle; use crate::database::db_handle::DbHandle;
@@ -110,7 +111,12 @@ impl<'db> RunningBuild<'db> {
}; };
match message { match message {
NixAction::Msg(msg_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) => { NixAction::Start(activity_start_message) => {
match 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) => { NixAction::Stop(stop_message) => {
let activity = self let activity = self
@@ -277,7 +283,7 @@ impl<'db> RunningBuild<'db> {
.get_activity_id(stop_message.id) .get_activity_id(stop_message.id)
.map(|activity_id| self.activity_tree.get_mut(&activity_id))?; .map(|activity_id| self.activity_tree.get_mut(&activity_id))?;
activity.get_mut_activity().stop(); activity.get_mut_activity().stop();
// self.print_current_status(); self.print_current_status();
// println!("{}", serde_json::to_string(&message)?); // println!("{}", serde_json::to_string(&message)?);
} }
NixAction::Result(activity_result_message) => { NixAction::Result(activity_result_message) => {