gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-29 10:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Rust Edition to 2024 (#7766)

Browse Source 
* #7749

Thanks @dknopik and @michaelsproul for your help!
This commit is contained in:
chonghe
2025-08-13 11:04:31 +08:00
committed by GitHub
parent bd6b8b6a65
commit 522bd9e9c6
468 changed files with 3594 additions and 3396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/logging/src/sse_logging_components.rs
View File

@@ -1,8 +1,8 @@
//! This module provides an implementation of `tracing_subscriber::layer::Layer` that optionally writes to a channel if
//! there are subscribers to a HTTP SSE stream.
use serde_json::json;
use serde_json::Value;
use serde_json::json;
use std::sync::Arc;
use tokio::sync::broadcast::Sender;
use tracing::field::{Field, Visit};
@@ -45,13 +45,12 @@ impl<S: Subscriber> Layer<S> for SSELoggingComponents {
.get("fields")
.and_then(|fields| fields.get("error_type"))
.and_then(|val| val.as_str())
&& error_type.eq_ignore_ascii_case("crit")
{
if error_type.eq_ignore_ascii_case("crit") {
log_entry["level"] = json!("CRIT");
log_entry["level"] = json!("CRIT");
if let Some(Value::Object(ref mut map)) = log_entry.get_mut("fields") {
map.remove("error_type");
}
if let Some(Value::Object(map)) = log_entry.get_mut("fields") {
map.remove("error_type");
}
}
@@ -73,9 +72,11 @@ impl TracingEventVisitor {
let mut log_entry = serde_json::Map::new();
log_entry.insert(
"time".to_string(),
json!(chrono::Local::now()
.format("%b %d %H:%M:%S%.3f")
.to_string()),
json!(
chrono::Local::now()
.format("%b %d %H:%M:%S%.3f")
.to_string()
),
);
log_entry.insert("level".to_string(), json!(metadata.level().to_string()));
log_entry.insert("target".to_string(), json!(metadata.target()));