Skip to content

Commit e7b2570

Browse files
committed
Fix the inverted RUST_LOG filter
RUST_LOG supports regex filtering of log messages with a syntax like `RUST_LOG=main/foo` to use the regex filter 'foo'. Unfortunately, the filter was inverted, so `RUST_LOG=main/foo` would actually show all messages except the ones containing 'foo'.
1 parent ad9ed40 commit e7b2570

File tree

2 files changed

+56
-2
lines changed

2 files changed

+56
-2
lines changed

src/liblog/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ pub fn log(level: u32, loc: &'static LogLocation, args: &fmt::Arguments) {
283283
// Test the literal string from args against the current filter, if there
284284
// is one.
285285
match unsafe { FILTER.as_ref() } {
286-
Some(filter) if filter.is_match(args.to_string().as_slice()) => return,
286+
Some(filter) if !filter.is_match(args.to_string().as_slice()) => return,
287287
_ => {}
288288
}
289289

@@ -383,7 +383,7 @@ fn enabled(level: u32,
383383

384384
/// Initialize logging for the current process.
385385
///
386-
/// This is not threadsafe at all, so initialization os performed through a
386+
/// This is not threadsafe at all, so initialization is performed through a
387387
/// `Once` primitive (and this function is called from that primitive).
388388
fn init() {
389389
let (mut directives, filter) = match os::getenv("RUST_LOG") {

src/test/run-pass/rust-log-filter.rs

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// exec-env:RUST_LOG=rust-log-filter/f.o
12+
13+
#![feature(phase)]
14+
#[phase(plugin,link)]
15+
extern crate log;
16+
17+
pub struct ChannelLogger {
18+
tx: Sender<String>
19+
}
20+
21+
impl ChannelLogger {
22+
pub fn new() -> (Box<ChannelLogger>, Receiver<String>) {
23+
let (tx, rx) = channel();
24+
(box ChannelLogger { tx: tx }, rx)
25+
}
26+
}
27+
28+
impl log::Logger for ChannelLogger {
29+
fn log(&mut self, record: &log::LogRecord) {
30+
self.tx.send(format!("{}", record.args));
31+
}
32+
}
33+
34+
pub fn main() {
35+
let (logger, rx) = ChannelLogger::new();
36+
37+
spawn(proc() {
38+
log::set_logger(logger);
39+
40+
// our regex is "f.o"
41+
// ensure it is a regex, and isn't anchored
42+
info!("foo");
43+
info!("bar");
44+
info!("foo bar");
45+
info!("bar foo");
46+
info!("f1o");
47+
});
48+
49+
assert_eq!(rx.recv().as_slice(), "foo");
50+
assert_eq!(rx.recv().as_slice(), "foo bar");
51+
assert_eq!(rx.recv().as_slice(), "bar foo");
52+
assert_eq!(rx.recv().as_slice(), "f1o");
53+
assert!(rx.recv_opt().is_err());
54+
}

0 commit comments

Comments
 (0)