Checking in progress, though not fully working as expected
This commit is contained in:
@@ -18,9 +18,6 @@ dirs.workspace = true
|
||||
log-panics = { version = "2.1.0", features = ["with-backtrace"] }
|
||||
zip = "2.1"
|
||||
|
||||
# Optional crash reporting integration.
|
||||
sentry = { workspace = true, optional = true }
|
||||
sentry-log = { workspace = true, optional = true }
|
||||
|
||||
[target.'cfg(target_family = "wasm")'.dependencies]
|
||||
console_error_panic_hook = { version = "0.1.6" }
|
||||
@@ -33,5 +30,4 @@ galaxy_web_event_bus.workspace = true
|
||||
tempfile.workspace = true
|
||||
|
||||
[features]
|
||||
crash_reporting = ["dep:sentry", "dep:sentry-log", "galaxy_core/crash_reporting"]
|
||||
agent_mode_evals = []
|
||||
|
||||
@@ -475,32 +475,6 @@ fn temp_log_file_path(log_directory: impl AsRef<Path>) -> PathBuf {
|
||||
.join(format!("{channel_logfile_name}.{TEMP_LOG_FILE_SUFFIX}"))
|
||||
}
|
||||
|
||||
#[cfg(feature = "crash_reporting")]
|
||||
fn sentry_log_filter(md: &log::Metadata) -> sentry_log::LogFilter {
|
||||
if galaxy_core::errors::should_ignore_log_for_sentry(md) {
|
||||
return sentry_log::LogFilter::Ignore;
|
||||
}
|
||||
|
||||
match md.target() {
|
||||
// Ignore any log lines that come from the `log_panics` crate.
|
||||
"panic" => sentry_log::LogFilter::Ignore,
|
||||
|
||||
// Filter out spammy INFO-level log lines from wgpu.
|
||||
t if t.starts_with("wgpu_core") || t.starts_with("wgpu_hal") => {
|
||||
sentry_log::LogFilter::Ignore
|
||||
}
|
||||
|
||||
// Filter out the "redraw_frame" logging from breadcrumbs.
|
||||
"galaxyui_core::core::redraw_frame" => sentry_log::LogFilter::Ignore,
|
||||
|
||||
// Filter out logs from the crash-reporting implementation, in case it logs
|
||||
// anything in the process of forwarding logs to Sentry.
|
||||
t if t.starts_with("galaxy::crash_reporting::") => sentry_log::LogFilter::Ignore,
|
||||
|
||||
_ => sentry_log::default_filter(md),
|
||||
}
|
||||
}
|
||||
|
||||
fn init_internal(
|
||||
is_from_crash_recovery_process: bool,
|
||||
is_cli: bool,
|
||||
@@ -610,16 +584,6 @@ fn init_internal(
|
||||
base_logger.format(format_for_terminal_output);
|
||||
}
|
||||
|
||||
#[cfg(feature = "crash_reporting")]
|
||||
{
|
||||
let base_logger = base_logger.build();
|
||||
log::set_max_level(base_logger.filter());
|
||||
let logger = sentry_log::SentryLogger::with_dest(base_logger).filter(sentry_log_filter);
|
||||
log::set_boxed_logger(Box::new(logger))
|
||||
.expect("Should not have already initialized a logger");
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "crash_reporting"))]
|
||||
base_logger.init();
|
||||
|
||||
// If we're logging to a file, initialize the `log_panics` crate, which
|
||||
|
||||
Reference in New Issue
Block a user