|
|
@ -1,29 +1,26 @@
|
|
|
|
|
|
|
|
use std::collections::HashMap;
|
|
|
|
use anyhow::Result;
|
|
|
|
use anyhow::Result;
|
|
|
|
use std::fmt::Debug;
|
|
|
|
use std::fmt::Debug;
|
|
|
|
use std::fs::OpenOptions;
|
|
|
|
use std::fs::OpenOptions;
|
|
|
|
use std::io::Write;
|
|
|
|
use std::io::Write;
|
|
|
|
use std::option::Option::Some;
|
|
|
|
use std::option::Option::Some;
|
|
|
|
use std::path::{Path, PathBuf};
|
|
|
|
use std::path::{Path, PathBuf};
|
|
|
|
|
|
|
|
use std::sync::Mutex;
|
|
|
|
use tracing::field::Field;
|
|
|
|
use tracing::field::Field;
|
|
|
|
use tracing::span::Attributes;
|
|
|
|
use tracing::span::Attributes;
|
|
|
|
use tracing::{Id, Level, Subscriber};
|
|
|
|
use tracing::{Event, Id, Level, Subscriber};
|
|
|
|
use tracing_subscriber::fmt::format::{Format, Json, JsonFields};
|
|
|
|
use tracing_subscriber::fmt::format::{DefaultFields, Format, Json, JsonFields};
|
|
|
|
use tracing_subscriber::fmt::time::UtcTime;
|
|
|
|
use tracing_subscriber::fmt::time::UtcTime;
|
|
|
|
use tracing_subscriber::layer::{Context, SubscriberExt};
|
|
|
|
use tracing_subscriber::layer::{Context, SubscriberExt};
|
|
|
|
use tracing_subscriber::util::SubscriberInitExt;
|
|
|
|
use tracing_subscriber::{EnvFilter, fmt, Layer, Registry};
|
|
|
|
use tracing_subscriber::{EnvFilter, FmtSubscriber, Layer, Registry};
|
|
|
|
|
|
|
|
use tracing_subscriber::fmt::{format, FormatEvent, MakeWriter};
|
|
|
|
|
|
|
|
use serde_json::{json, Value};
|
|
|
|
use serde_json::{json, Value};
|
|
|
|
use serde::Serialize;
|
|
|
|
use serde::Serialize;
|
|
|
|
|
|
|
|
use time::format_description::well_known::Rfc3339;
|
|
|
|
|
|
|
|
use tracing::subscriber::set_global_default;
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Serialize)]
|
|
|
|
#[derive(Debug, Serialize)]
|
|
|
|
struct LogEvent<'a> {
|
|
|
|
struct LogEvent<'a> {
|
|
|
|
message: String,
|
|
|
|
|
|
|
|
level: &'a str,
|
|
|
|
level: &'a str,
|
|
|
|
target: &'a str,
|
|
|
|
|
|
|
|
module: &'a str,
|
|
|
|
|
|
|
|
file: Option<&'a str>,
|
|
|
|
|
|
|
|
line: Option<u32>,
|
|
|
|
|
|
|
|
fields: Value,
|
|
|
|
fields: Value,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -34,23 +31,13 @@ fn format_event_as_json<'a, S>(
|
|
|
|
) -> serde_json::Result<String> {
|
|
|
|
) -> serde_json::Result<String> {
|
|
|
|
// Extracting fields from the event into a serde_json::Value
|
|
|
|
// Extracting fields from the event into a serde_json::Value
|
|
|
|
let mut fields = json!({});
|
|
|
|
let mut fields = json!({});
|
|
|
|
let mut message = String::new(); // For capturing the main message
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
event.record(&mut |field: &Field, value: &dyn Debug| {
|
|
|
|
event.record(&mut |field: &Field, value: &dyn Debug| {
|
|
|
|
if field.name() == "message" {
|
|
|
|
|
|
|
|
message = format!("{:?}", value);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
fields[field.name()] = json!(format!("{:?}", value));
|
|
|
|
fields[field.name()] = json!(format!("{:?}", value));
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
let log = LogEvent {
|
|
|
|
let log = LogEvent {
|
|
|
|
message, // Use the captured message here
|
|
|
|
|
|
|
|
level: event.metadata().level().as_str(),
|
|
|
|
level: event.metadata().level().as_str(),
|
|
|
|
target: event.metadata().target(),
|
|
|
|
|
|
|
|
module: event.metadata().module_path().unwrap_or_default(),
|
|
|
|
|
|
|
|
file: event.metadata().file(),
|
|
|
|
|
|
|
|
line: event.metadata().line(),
|
|
|
|
|
|
|
|
fields,
|
|
|
|
fields,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
@ -63,22 +50,32 @@ struct SwapIdVisitor {
|
|
|
|
|
|
|
|
|
|
|
|
pub struct FileLayer {
|
|
|
|
pub struct FileLayer {
|
|
|
|
dir: PathBuf,
|
|
|
|
dir: PathBuf,
|
|
|
|
|
|
|
|
file_handles: Mutex<HashMap<String, std::fs::File>>,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl FileLayer {
|
|
|
|
impl FileLayer {
|
|
|
|
pub fn new(dir: impl AsRef<Path>) -> Self {
|
|
|
|
pub fn new(dir: impl AsRef<Path>) -> Self {
|
|
|
|
Self {
|
|
|
|
Self {
|
|
|
|
dir: dir.as_ref().to_path_buf(),
|
|
|
|
dir: dir.as_ref().to_path_buf(),
|
|
|
|
|
|
|
|
file_handles: Mutex::new(HashMap::new()),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn get_log_path(&self, swap_id: &str) -> PathBuf {
|
|
|
|
fn get_log_path(&self, swap_id: String) -> PathBuf {
|
|
|
|
self.dir.join(format!("swap-{}.log", swap_id))
|
|
|
|
self.dir.join(format!("swap-{}.log", swap_id))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn append_to_file(&self, swap_id: &str, message: &str) -> std::io::Result<()> {
|
|
|
|
fn append_to_file(&self, swap_id: String, message: &str) -> std::io::Result<()> {
|
|
|
|
let path = self.get_log_path(swap_id);
|
|
|
|
let mut cache = self.file_handles.lock().unwrap();
|
|
|
|
let mut file = OpenOptions::new().append(true).create(true).open(path)?;
|
|
|
|
let swap_id_clone = swap_id.clone();
|
|
|
|
|
|
|
|
let file = cache.entry(swap_id).or_insert_with(|| {
|
|
|
|
|
|
|
|
println!("Opening file for swap log {}", swap_id_clone);
|
|
|
|
|
|
|
|
OpenOptions::new()
|
|
|
|
|
|
|
|
.create(true)
|
|
|
|
|
|
|
|
.append(true)
|
|
|
|
|
|
|
|
.open(self.get_log_path(swap_id_clone))
|
|
|
|
|
|
|
|
.expect("Failed to open file")
|
|
|
|
|
|
|
|
});
|
|
|
|
file.write_all(message.as_bytes())
|
|
|
|
file.write_all(message.as_bytes())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -103,11 +100,10 @@ impl<S> Layer<S> for FileLayer
|
|
|
|
if let Some(current_span_id) = ctx.current_span().id() {
|
|
|
|
if let Some(current_span_id) = ctx.current_span().id() {
|
|
|
|
if let Some(span) = ctx.span(current_span_id) {
|
|
|
|
if let Some(span) = ctx.span(current_span_id) {
|
|
|
|
if let Some(swap_id) = span.extensions().get::<String>() {
|
|
|
|
if let Some(swap_id) = span.extensions().get::<String>() {
|
|
|
|
// TODO: This is a hack, I need to figure out how to get the JSON formatter to work
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if let Ok(json_log) = format_event_as_json(&ctx, event) {
|
|
|
|
if let Ok(json_log) = format_event_as_json(&ctx, event) {
|
|
|
|
self.append_to_file(swap_id, &format!("{}\n", json_log))
|
|
|
|
if let Err(err) = self.append_to_file(swap_id.clone(), &format!("{}\n", json_log)) {
|
|
|
|
.expect("Failed to write to file");
|
|
|
|
println!("Failed to write log to assigned swap log file: {}", err);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -124,21 +120,104 @@ impl tracing::field::Visit for SwapIdVisitor {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pub fn init(debug: bool, json: bool, dir: impl AsRef<Path>) -> Result<()> {
|
|
|
|
pub fn init(debug: bool, json: bool, dir: impl AsRef<Path>) -> Result<()> {
|
|
|
|
let level = if debug { Level::DEBUG } else { Level::INFO };
|
|
|
|
let level_filter = EnvFilter::try_new("swap=debug")?;
|
|
|
|
let is_terminal = atty::is(atty::Stream::Stderr);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let file_layer = FileLayer::new(dir.as_ref());
|
|
|
|
let file_layer = FileLayer::new(dir.as_ref());
|
|
|
|
|
|
|
|
|
|
|
|
FmtSubscriber::builder()
|
|
|
|
let registry = Registry::default().with(level_filter).with(file_layer);
|
|
|
|
.with_env_filter(format!("swap={}", level))
|
|
|
|
|
|
|
|
.with_writer(std::io::stderr)
|
|
|
|
if json && debug {
|
|
|
|
|
|
|
|
set_global_default(registry.with(debug_json_terminal_printer()))?;
|
|
|
|
|
|
|
|
} else if json && !debug {
|
|
|
|
|
|
|
|
set_global_default(registry.with(info_json_terminal_printer()))?;
|
|
|
|
|
|
|
|
} else if !json && debug {
|
|
|
|
|
|
|
|
set_global_default(registry.with(debug_terminal_printer()))?;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
set_global_default(registry.with(info_terminal_printer()))?;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
tracing::info!("Logging initialized to {}", dir.as_ref().display());
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pub struct StdErrPrinter<L> {
|
|
|
|
|
|
|
|
inner: L,
|
|
|
|
|
|
|
|
level: Level,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
type StdErrLayer<S, T> = fmt::Layer<
|
|
|
|
|
|
|
|
S,
|
|
|
|
|
|
|
|
DefaultFields,
|
|
|
|
|
|
|
|
Format<fmt::format::Full, T>,
|
|
|
|
|
|
|
|
fn() -> std::io::Stderr,
|
|
|
|
|
|
|
|
>;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
type StdErrJsonLayer<S, T> = fmt::Layer<
|
|
|
|
|
|
|
|
S,
|
|
|
|
|
|
|
|
JsonFields,
|
|
|
|
|
|
|
|
Format<Json, T>,
|
|
|
|
|
|
|
|
fn() -> std::io::Stderr,
|
|
|
|
|
|
|
|
>;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn debug_terminal_printer<S>() -> StdErrPrinter<StdErrLayer<S, UtcTime<Rfc3339>>> {
|
|
|
|
|
|
|
|
let is_terminal = atty::is(atty::Stream::Stderr);
|
|
|
|
|
|
|
|
StdErrPrinter {
|
|
|
|
|
|
|
|
inner: fmt::layer()
|
|
|
|
|
|
|
|
.with_ansi(is_terminal)
|
|
|
|
|
|
|
|
.with_target(false)
|
|
|
|
|
|
|
|
.with_timer(UtcTime::rfc_3339())
|
|
|
|
|
|
|
|
.with_writer(std::io::stderr),
|
|
|
|
|
|
|
|
level: Level::DEBUG,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn debug_json_terminal_printer<S>() -> StdErrPrinter<StdErrJsonLayer<S, UtcTime<Rfc3339>>> {
|
|
|
|
|
|
|
|
let is_terminal = atty::is(atty::Stream::Stderr);
|
|
|
|
|
|
|
|
StdErrPrinter {
|
|
|
|
|
|
|
|
inner: fmt::layer()
|
|
|
|
.with_ansi(is_terminal)
|
|
|
|
.with_ansi(is_terminal)
|
|
|
|
|
|
|
|
.with_target(false)
|
|
|
|
.with_timer(UtcTime::rfc_3339())
|
|
|
|
.with_timer(UtcTime::rfc_3339())
|
|
|
|
|
|
|
|
.json()
|
|
|
|
|
|
|
|
.with_writer(std::io::stderr),
|
|
|
|
|
|
|
|
level: Level::DEBUG,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn info_terminal_printer<S>() -> StdErrPrinter<StdErrLayer<S, ()>> {
|
|
|
|
|
|
|
|
let is_terminal = atty::is(atty::Stream::Stderr);
|
|
|
|
|
|
|
|
StdErrPrinter {
|
|
|
|
|
|
|
|
inner: fmt::layer()
|
|
|
|
|
|
|
|
.with_ansi(is_terminal)
|
|
|
|
.with_target(false)
|
|
|
|
.with_target(false)
|
|
|
|
.finish()
|
|
|
|
.with_level(false)
|
|
|
|
.with(file_layer)
|
|
|
|
.without_time()
|
|
|
|
.init();
|
|
|
|
.with_writer(std::io::stderr),
|
|
|
|
|
|
|
|
level: Level::INFO,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
tracing::info!("Logging initialized to {}", dir.as_ref().display());
|
|
|
|
fn info_json_terminal_printer<S>() -> StdErrPrinter<StdErrJsonLayer<S, ()>> {
|
|
|
|
Ok(())
|
|
|
|
let is_terminal = atty::is(atty::Stream::Stderr);
|
|
|
|
|
|
|
|
StdErrPrinter {
|
|
|
|
|
|
|
|
inner: fmt::layer()
|
|
|
|
|
|
|
|
.with_ansi(is_terminal)
|
|
|
|
|
|
|
|
.with_target(false)
|
|
|
|
|
|
|
|
.with_level(false)
|
|
|
|
|
|
|
|
.without_time()
|
|
|
|
|
|
|
|
.json()
|
|
|
|
|
|
|
|
.with_writer(std::io::stderr),
|
|
|
|
|
|
|
|
level: Level::INFO,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl<L, S> Layer<S> for StdErrPrinter<L>
|
|
|
|
|
|
|
|
where
|
|
|
|
|
|
|
|
L: 'static + Layer<S>,
|
|
|
|
|
|
|
|
S: Subscriber + for<'a> tracing_subscriber::registry::LookupSpan<'a>,
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
fn on_event(&self, event: &Event<'_>, ctx: Context<'_, S>) {
|
|
|
|
|
|
|
|
if self.level.ge(event.metadata().level()) {
|
|
|
|
|
|
|
|
self.inner.on_event(event, ctx);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|