Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix #6031. Allow symbolic log levels, not just numbers.
  • Loading branch information
novalis committed Sep 7, 2013
1 parent 12bca20 commit c891fa3
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 21 deletions.
8 changes: 5 additions & 3 deletions doc/rust.md
Expand Up @@ -3385,9 +3385,11 @@ The path to a module consists of the crate name, any parent modules,
then the module itself, all separated by double colons (`::`). The
optional log level can be appended to the module path with an equals
sign (`=`) followed by the log level, from 1 to 4, inclusive. Level 1
is the error level, 2 is warning, 3 info, and 4 debug. Any logs
less than or equal to the specified level will be output. If not
specified then log level 4 is assumed.
is the error level, 2 is warning, 3 info, and 4 debug. You can also
use the symbolic constants `error`, `warn`, `info`, and `debug`. Any
logs less than or equal to the specified level will be output. If not
specified then log level 4 is assumed. However, debug messages are
only available if `--cfg=debug` is passed to `rustc`.

As an example, to see all the logs generated by the compiler, you would set
`RUST_LOG` to `rustc`, which is the crate name (as specified in its `link`
Expand Down
71 changes: 53 additions & 18 deletions src/libstd/rt/logging.rs
Expand Up @@ -10,11 +10,12 @@
use cast::transmute;
use either::*;
use libc::{c_void, uintptr_t, c_char, exit, STDERR_FILENO};
use option::{Some, None};
use option::{Some, None, Option};
use rt::util::dumb_println;
use str::StrSlice;
use str::raw::from_c_str;
use u32;
use u32::{min};
use unstable::raw::Closure;
use vec::ImmutableVector;

Expand All @@ -30,7 +31,6 @@ struct ModEntry{
log_level: *mut u32
}

static MAX_LOG_DIRECTIVES: u32 = 255;
static MAX_LOG_LEVEL: u32 = 255;
static DEFAULT_LOG_LEVEL: u32 = 1;

Expand Down Expand Up @@ -68,42 +68,68 @@ fn iter_crate_map(map: *u8, f: &fn(*mut ModEntry)) {
data: *c_void);
}
}
static log_level_names : &'static[&'static str] = &'static["error", "warn", "info", "debug"];

/// Parse an individual log level that is either a number or a symbolic log level
fn parse_log_level(level: &str) -> Option<u32> {
let num = u32::from_str(level);
let mut log_level;
match (num) {
Some(num) => {
if num < MAX_LOG_LEVEL {
log_level = Some(num);
} else {
log_level = Some(MAX_LOG_LEVEL);
}
}
_ => {
let position = log_level_names.iter().position(|&name| name == level);
match (position) {
Some(position) => {
log_level = Some(min(MAX_LOG_LEVEL, (position + 1) as u32))
},
_ => {
log_level = None;
}
}
}
}
log_level
}


/// Parse a logging specification string (e.g: "crate1,crate2::mod3,crate3::x=1")
/// and return a vector with log directives.
/// Valid log levels are 0-255, with the most likely ones being 0-3 (defined in std::).
/// Valid log levels are 0-255, with the most likely ones being 1-4 (defined in std::).
/// Also supports string log levels of error, warn, info, and debug

fn parse_logging_spec(spec: ~str) -> ~[LogDirective]{
let mut dirs = ~[];
for s in spec.split_iter(',') {
let parts: ~[&str] = s.split_iter('=').collect();
let mut loglevel;
let mut log_level;
match parts.len() {
1 => loglevel = MAX_LOG_LEVEL,
1 => log_level = MAX_LOG_LEVEL,
2 => {
let num = u32::from_str(parts[1]);
match (num) {
let possible_log_level = parse_log_level(parts[1]);
match possible_log_level {
Some(num) => {
if num < MAX_LOG_LEVEL {
loglevel = num;
} else {
loglevel = MAX_LOG_LEVEL;
}
}
log_level = num;
},
_ => {
dumb_println(fmt!("warning: invalid logging spec \
'%s', ignoring it", s));
loop;
dumb_println(fmt!("warning: invalid logging spec \
'%s', ignoring it", parts[1]));
loop;
}
}
if loglevel > MAX_LOG_LEVEL { loglevel = MAX_LOG_LEVEL}
},
_ => {
dumb_println(fmt!("warning: invalid logging spec '%s',\
ignoring it", s));
loop;
}
}
let dir = LogDirective {name: parts[0].to_owned(), level: loglevel};
let dir = LogDirective {name: parts[0].to_owned(), level: log_level};
dirs.push(dir);
}
return dirs;
Expand Down Expand Up @@ -268,6 +294,15 @@ fn parse_logging_spec_invalid_log_level() {
assert_eq!(dirs[0].level, 4);
}

#[test]
fn parse_logging_spec_string_log_level() {
// test parse_logging_spec with 'warn' as log level
let dirs: ~[LogDirective] = parse_logging_spec(~"crate1::mod1=wrong,crate2=warn");
assert_eq!(dirs.len(), 1);
assert!(dirs[0].name == ~"crate2");
assert_eq!(dirs[0].level, 2);
}

// Tests for update_entry
#[test]
fn update_entry_match_full_path() {
Expand Down

0 comments on commit c891fa3

Please sign in to comment.