mirror of
https://github.com/servo/servo.git
synced 2025-08-04 05:00:08 +01:00
Auto merge of #20468 - Eijebong:fix_log, r=mbrubeck
Fix style/build_gecko.rs for log 0.4 <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20468) <!-- Reviewable:end -->
This commit is contained in:
commit
c8b0dc965d
1 changed files with 14 additions and 8 deletions
|
@ -448,11 +448,11 @@ mod bindings {
|
|||
}
|
||||
|
||||
impl log::Log for BuildLogger {
|
||||
fn enabled(&self, meta: &log::LogMetadata) -> bool {
|
||||
fn enabled(&self, meta: &log::Metadata) -> bool {
|
||||
self.file.is_some() && meta.target().contains(&self.filter)
|
||||
}
|
||||
|
||||
fn log(&self, record: &log::LogRecord) {
|
||||
fn log(&self, record: &log::Record) {
|
||||
if !self.enabled(record.metadata()) {
|
||||
return;
|
||||
}
|
||||
|
@ -463,21 +463,27 @@ mod bindings {
|
|||
record.level(),
|
||||
record.target(),
|
||||
record.args(),
|
||||
record.location().file(),
|
||||
record.location().line());
|
||||
record.file().unwrap_or("<unknown>"),
|
||||
record.line().unwrap_or(0));
|
||||
}
|
||||
|
||||
fn flush(&self) {
|
||||
if let Some(ref file) = self.file {
|
||||
file.lock().unwrap().flush().unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(path) = env::var_os("STYLO_BUILD_LOG") {
|
||||
log::set_logger(|log_level| {
|
||||
log_level.set(log::LogLevelFilter::Debug);
|
||||
log::set_max_level(log::LevelFilter::Debug);
|
||||
log::set_boxed_logger(
|
||||
Box::new(BuildLogger {
|
||||
file: fs::File::create(path).ok().map(Mutex::new),
|
||||
filter: env::var("STYLO_BUILD_FILTER").ok()
|
||||
.unwrap_or_else(|| "bindgen".to_owned()),
|
||||
})
|
||||
})
|
||||
.expect("Failed to set logger.");
|
||||
).expect("Failed to set logger.");
|
||||
|
||||
true
|
||||
} else {
|
||||
false
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue