daqbuf/daqbuffer
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt to LogItem api

Browse Source
This commit is contained in:
Dominik Werder
2025-06-18 13:09:24 +02:00
parent 17c24d0c15
commit 72cff94b21
11 changed files with 69 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/disk/src/eventchunker.rs
View File

@@ -344,7 +344,7 @@ impl EventChunker {
self.dbg_path
);
warn!("{}", msg);
let item = LogItem::from_node(self.node_ix, Level::INFO, msg);
let item = LogItem::from_node(Level::INFO, msg);
self.log_items.push_back(item);
}
if self.seen_before_range_count > 100 {
@@ -442,7 +442,7 @@ impl EventChunker {
scalar_type,
self.fetch_info.scalar_type(),
);
let item = LogItem::from_node(self.node_ix, Level::WARN, msg);
let item = LogItem::from_node(Level::WARN, msg);
log_items.push(item);
}
if false {
@@ -452,7 +452,7 @@ impl EventChunker {
discard = true;
self.discard_count_shape += 1;
let msg = format!("shape mismatch {:?} {:?}", shape_this, self.fetch_info.shape(),);
let item = LogItem::from_node(self.node_ix, Level::WARN, msg);
let item = LogItem::from_node(Level::WARN, msg);
log_items.push(item);
}
}
@@ -486,7 +486,7 @@ impl EventChunker {
self.fetch_info.shape(),
sh,
);
let item = LogItem::from_node(self.node_ix, Level::WARN, msg);
let item = LogItem::from_node(Level::WARN, msg);
log_items.push(item);
}
}
@@ -499,7 +499,7 @@ impl EventChunker {
self.fetch_info.scalar_type(),
self.fetch_info.shape(),
);
let item = LogItem::from_node(self.node_ix, Level::WARN, msg);
let item = LogItem::from_node(Level::WARN, msg);
log_items.push(item);
}
}

15
crates/disk/src/eventchunkermultifile.rs
View File

@@ -136,11 +136,7 @@ impl Stream for EventChunkerMultifile {
if min <= self.max_ts {
let msg = format!("EventChunkerMultifile repeated or unordered ts {}", min);
error!("{}", msg);
let item = LogItem {
node_ix: self.node_ix as _,
level: Level::INFO,
msg,
};
let item = LogItem::info(msg);
self.log_queue.push_back(item);
}
self.max_ts = max;
@@ -185,11 +181,11 @@ impl Stream for EventChunkerMultifile {
Ready(Some(k)) => match k {
Ok(ofs) => {
let msg = format!("received files for timebin {:?}", ofs.timebin);
let item = LogItem::from_node(self.node_ix, Level::INFO, msg);
let item = LogItem::from_node(Level::INFO, msg);
self.log_queue.push_back(item);
for e in &ofs.files {
let msg = format!("file {:?}", e);
let item = LogItem::from_node(self.node_ix, Level::INFO, msg);
let item = LogItem::from_node(Level::INFO, msg);
self.log_queue.push_back(item);
}
self.files_count += ofs.files.len() as u32;
@@ -222,7 +218,7 @@ impl Stream for EventChunkerMultifile {
continue;
} else if ofs.files.len() == 0 {
let msg = format!("use opened files {:?} no files", ofs);
let item = LogItem::from_node(self.node_ix, Level::DEBUG, msg);
let item = LogItem::from_node(Level::DEBUG, msg);
Ready(Some(Ok(StreamItem::Log(item))))
} else {
let mut chunkers = Vec::new();
@@ -249,7 +245,7 @@ impl Stream for EventChunkerMultifile {
let filtered = RangeFilter2::new(merged, self.range.clone(), self.one_before);
self.evs = Some(Box::pin(filtered));
let msg = format!("LOCALLY MERGED");
let item = LogItem::from_node(self.node_ix, Level::DEBUG, msg);
let item = LogItem::from_node(Level::DEBUG, msg);
Ready(Some(Ok(StreamItem::Log(item))))
}
}
@@ -261,7 +257,6 @@ impl Stream for EventChunkerMultifile {
Ready(None) => {
self.done = true;
let item = LogItem::from_node(
self.node_ix,
Level::DEBUG,
format!(
"EventChunkerMultifile used {} datafiles beg {} end {} node_ix {}",

4
crates/disk/src/eventfilter.rs
View File

@@ -35,7 +35,7 @@ impl<INP> EventFullShapeFilter<INP> {
"EventFullShapeFilter shape_derived mismatch {:?} {:?}",
sh, self.shape_exp
);
let item = LogItem::from_node(node_ix, Level::WARN, msg);
let item = LogItem::from_node(Level::WARN, msg);
self.log_items.push_back(item);
false
} else {
@@ -47,7 +47,7 @@ impl<INP> EventFullShapeFilter<INP> {
"EventFullShapeFilter shape_derived mismatch {:?} {:?}",
sh, self.shape_exp
);
let item = LogItem::from_node(self.node_ix, Level::WARN, msg);
let item = LogItem::from_node(Level::WARN, msg);
self.log_items.push_back(item);
false
}

18
crates/disk/src/streamlog.rs
View File

@@ -16,11 +16,7 @@ impl Streamlog {
}
pub fn append(&mut self, level: Level, msg: String) {
let item = LogItem {
node_ix: self.node_ix,
level,
msg,
};
let item = LogItem::level_msg(level, msg);
self.items.push_back(item);
}
@@ -29,21 +25,21 @@ impl Streamlog {
}
pub fn emit(item: &LogItem) {
match item.level {
match item.level() {
Level::ERROR => {
error!("StreamLog Node {} {}", item.node_ix, item.msg);
error!("StreamLog {}", item.display_log_file());
}
Level::WARN => {
warn!("StreamLog Node {} {}", item.node_ix, item.msg);
warn!("StreamLog {}", item.display_log_file());
}
Level::INFO => {
info!("StreamLog Node {} {}", item.node_ix, item.msg);
info!("StreamLog {}", item.display_log_file());
}
Level::DEBUG => {
debug!("StreamLog Node {} {}", item.node_ix, item.msg);
debug!("StreamLog {}", item.display_log_file());
}
Level::TRACE => {
trace!("StreamLog Node {} {}", item.node_ix, item.msg);
trace!("StreamLog {}", item.display_log_file());
}
}
}