modified logging function to truncate output and adjusted error output formatting tests to be compatible with both the new and old runtimes

1 files changed, 10 insertions, 0 deletions

diff --git a/src/libstd/logging.rs b/src/libstd/logging.rs
index 6e11d14aea9..c53e7e82841 100644
--- a/src/libstd/logging.rs
+++ b/src/libstd/logging.rs
@@ -85,6 +85,16 @@ pub fn log_type<T>(level: u32, object: &T) {
 fn newsched_log_str(msg: ~str) {
     use rt::task::Task;
     use rt::local::Local;
+    use str::StrSlice;
+    use container::Container;
+
+    // Truncate the string
+    let buf_bytes = 2048;
+    let msg = if msg.len() > buf_bytes {
+        msg.slice(0, buf_bytes) + "[...]"
+    } else {
+        msg
+    };
 
     unsafe {
         match Local::try_unsafe_borrow::<Task>() {