Make different color with INFO and DEBUG log

Print debug log as Gray scaled color

Change-Id: I81487def3f7ccc4849728dd7bd82c358b72d9956
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>

diff --git a/dali/internal/system/ubuntu-x11/logging-x.cpp b/dali/internal/system/ubuntu-x11/logging-x.cpp
index dc317a5..5ba89b6 100644 (file)
--- a/dali/internal/system/ubuntu-x11/logging-x.cpp
+++ b/dali/internal/system/ubuntu-x11/logging-x.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,22 +32,31 @@ void LogMessage(Dali::Integration::Log::DebugPriority level, std::string& messag
   const char* format = NULL;
   switch(level)
   {
-    case Dali::Integration::Log::DEBUG:
-      format = "\e[1;32mDEBUG:\e[21m %s: %s\e[0m";
+    case Dali::Integration::Log::DEBUG: ///< Gray color
+      format = "\e[1;38;5;243mDEBUG:\e[21m %s: %s\e[0m";
       break;
-    case Dali::Integration::Log::INFO:
+    case Dali::Integration::Log::INFO: ///< Green color
       format = "\e[1;32mINFO:\e[21m %s: %s\e[0m";
       break;
-    case Dali::Integration::Log::WARNING:
+    case Dali::Integration::Log::WARNING: ///< Yellow color
       format = "\e[1;33mWARN:\e[21m %s: %s\e[0m";
       break;
-    case Dali::Integration::Log::ERROR:
+    case Dali::Integration::Log::ERROR: ///< Bright Red color
       format = "\e[1;91mERROR:\e[21m %s: %s\e[0m";
       break;
     default:
       format = ":\e[21m %s: %s\e[0m";
       break;
   }
+
+  // Append line feed if message is not end with line feed.
+  if(message.size() == 0u || message.back() != '\n')
+  {
+    // Reserve to avoid doubled memory reallocation.
+    message.reserve(message.size() + 1u);
+    message.push_back('\n');
+  }
+
   printf(format, DALI_TAG, message.c_str());
 }
 

diff --git a/dali/internal/system/windows/logging-win.cpp b/dali/internal/system/windows/logging-win.cpp
index 2784c61..b3131bf 100644 (file)
--- a/dali/internal/system/windows/logging-win.cpp
+++ b/dali/internal/system/windows/logging-win.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,22 +32,31 @@ void LogMessage(Dali::Integration::Log::DebugPriority level, std::string& messag
   const char* format = NULL;
   switch(level)
   {
-    case Dali::Integration::Log::DEBUG:
-      format = "\e[1;34mDEBUG:\e[21m %s: %s\e[0m";
+    case Dali::Integration::Log::DEBUG: ///< Gray color
+      format = "\e[1;38;5;243mDEBUG:\e[21m %s: %s\e[0m";
       break;
-    case Dali::Integration::Log::INFO:
+    case Dali::Integration::Log::INFO: ///< Blue color
       format = "\e[1;34mINFO:\e[21m %s: %s\e[0m";
       break;
-    case Dali::Integration::Log::WARNING:
+    case Dali::Integration::Log::WARNING: ///< Yellow color
       format = "\e[1;33mWARN:\e[21m %s: %s\e[0m";
       break;
-    case Dali::Integration::Log::ERROR:
+    case Dali::Integration::Log::ERROR: ///< Bright Red color
       format = "\e[1;91mERROR:\e[21m %s: %s\e[0m";
       break;
     default:
       format = ":\e[21m %s: %s\e[0m";
       break;
   }
+
+  // Append line feed if message is not end with line feed.
+  if(message.size() == 0u || message.back() != '\n')
+  {
+    // Reserve to avoid doubled memory reallocation.
+    message.reserve(message.size() + 1u);
+    message.push_back('\n');
+  }
+
   printf(format, DALI_TAG, message.c_str());
 }