From 3508c463a27e854773a751be85d6783bc0c2e9f3 Mon Sep 17 00:00:00 2001 From: Dominik Werder Date: Wed, 18 Jun 2025 13:08:01 +0200 Subject: [PATCH] Adapt to LogItem api --- src/binning/timeweight/timeweight_bins_stream.rs | 3 +-- src/binning/timeweight/timeweight_events_dyn.rs | 3 +-- src/merger.rs | 16 ++++++---------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/binning/timeweight/timeweight_bins_stream.rs b/src/binning/timeweight/timeweight_bins_stream.rs index 9fc379b..f2f0752 100644 --- a/src/binning/timeweight/timeweight_bins_stream.rs +++ b/src/binning/timeweight/timeweight_bins_stream.rs @@ -121,8 +121,7 @@ impl BinnedBinsTimeweightStream { Ready(Some(Ok(DataItem(Data(x))))) } None => { - let item = - LogItem::from_node(888, log::Level::INFO, format!("no bins ready on eos")); + let item = LogItem::from_node(log::Level::INFO, format!("no bins ready on eos")); Ready(Some(Ok(Log(item)))) } } diff --git a/src/binning/timeweight/timeweight_events_dyn.rs b/src/binning/timeweight/timeweight_events_dyn.rs index 45778da..98c02d3 100644 --- a/src/binning/timeweight/timeweight_events_dyn.rs +++ b/src/binning/timeweight/timeweight_events_dyn.rs @@ -396,8 +396,7 @@ impl BinnedEventsTimeweightStream { None => { debug!("no bins ready on eos"); self.state = StreamState::Done; - let item = - LogItem::from_node(888, log::Level::INFO, format!("no bins ready on eos")); + let item = LogItem::from_node(log::Level::INFO, format!("no bins ready on eos")); Ready(Some(Ok(Log(item)))) } } diff --git a/src/merger.rs b/src/merger.rs index 989ad15..2c524ee 100644 --- a/src/merger.rs +++ b/src/merger.rs @@ -198,16 +198,12 @@ where if let Some((i1, t1)) = tslows[0].as_ref() { if *t1 <= self.dim0ix_max { self.dim0ix_max = *t1; - let item = LogItem { - node_ix: *i1 as _, - level: log::Level::INFO, - msg: format!( - "dim0ix_max {} vs {} diff {}", - self.dim0ix_max, - t1, - self.dim0ix_max.ns() - t1.ns() - ), - }; + let item = LogItem::info(format!( + "dim0ix_max {} vs {} diff {} i1 {i1}", + self.dim0ix_max, + t1, + self.dim0ix_max.ns() - t1.ns() + )); log_items.push(item); } }