Merge pull request #2496 from arkaitzj/log_cleanup

Moved log method into logger class better than scheduler

1 files changed, 17 insertions, 0 deletions

diff --git a/src/rt/rust_log.cpp b/src/rt/rust_log.cpp
index 29d35e27c21..774a549fe8b 100644
--- a/src/rt/rust_log.cpp
+++ b/src/rt/rust_log.cpp
@@ -90,6 +90,22 @@ append_string(char *buffer, const char *format, ...) {
 }
 
 void
+rust_log::log(rust_task* task, uint32_t level, char const *fmt, ...) {
+    char buf[BUF_BYTES];
+    va_list args;
+    va_start(args, fmt);
+    int formattedbytes = vsnprintf(buf, sizeof(buf), fmt, args);
+    if( formattedbytes and (unsigned)formattedbytes > BUF_BYTES ){
+        const char truncatedstr[] = "[...]";
+        memcpy( &buf[BUF_BYTES-sizeof(truncatedstr)],
+                truncatedstr,
+                sizeof(truncatedstr));
+    }
+    trace_ln(task, level, buf);
+    va_end(args);
+}
+
+void
 rust_log::trace_ln(char *prefix, char *message) {
     char buffer[BUF_BYTES] = "";
     _log_lock.lock();
@@ -302,6 +318,7 @@ void update_log_settings(void* crate_map, char* settings) {
     free(buffer);
 }
 
+
 //
 // Local Variables:
 // mode: C++