From bfba120133e10df7c1333b98a166d24490270032 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 28 Nov 2013 23:44:33 -0800 Subject: Fix initial debug statements printing twice It may mislead you into thinking tasks are spawning twice, when in fact they are not. --- src/libstd/logging.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/logging.rs b/src/libstd/logging.rs index 4af6d1d53be..1b540823f17 100644 --- a/src/libstd/logging.rs +++ b/src/libstd/logging.rs @@ -107,9 +107,10 @@ pub fn log(_level: u32, args: &fmt::Arguments) { let optional_task: Option<*mut Task> = Local::try_unsafe_borrow(); match optional_task { Some(local) => { + // Lazily initialize the local task's logger match (*local).logger { // Use the available logger if we have one - Some(ref mut logger) => return logger.log(args), + Some(ref mut logger) => { logger.log(args); } None => { let mut logger = StdErrLogger::new(); logger.log(args); @@ -117,10 +118,11 @@ pub fn log(_level: u32, args: &fmt::Arguments) { } } } - None => {} + // If there's no local task, then always log to stderr + None => { + let mut logger = StdErrLogger::new(); + logger.log(args); + } } - // There is no logger anywhere, just write to stderr - let mut logger = StdErrLogger::new(); - logger.log(args); } } -- cgit 1.4.1-3-g733a5