DLT, daemon: don't colorize logs, don't use optional getopt arguments.

Change-Id: I99375a7ca853d0b8e15dab81cfd497e15c734856

diff --git a/AudioManagerDaemon/src/CAmDltWrapper.cpp b/AudioManagerDaemon/src/CAmDltWrapper.cpp
index d1bbab2..5f921bc 100644 (file)
--- a/AudioManagerDaemon/src/CAmDltWrapper.cpp
+++ b/AudioManagerDaemon/src/CAmDltWrapper.cpp
@@ -26,6 +26,14 @@
 #include <iostream>
 #include <string.h>
 
+#ifdef COLORIZE_LOGS
+#    define SOURCE "\e[0;34m"
+#    define NORMAL "\e[0;30m"
+#else
+#    define SOURCE ""
+#    define NORMAL ""
+#endif
+
 namespace am
 {
 
@@ -68,7 +76,7 @@ CAmDltWrapper::CAmDltWrapper(const bool enableNoDLTDebug) :
 {
     (void) enableNoDLTDebug;
 #ifndef WITH_DLT
-    std::cout << "\e[0;34m[DLT]\e[0;30m\tRunning without DLT-support" << std::endl;
+    std::cout << SOURCE "[DLT]" NORMAL "\tRunning without DLT-support" << std::endl;
 #endif
 }
 
@@ -103,7 +111,7 @@ void CAmDltWrapper::registerContext(DltContext& handle, const char *contextid, c
         }
     }
 
-    std::cout << "\e[0;34m[DLT]\e[0;30m\tRegistering Context " << contextid << " , " << description << std::endl;
+    std::cout << SOURCE "[DLT]" NORMAL "\tRegistering Context " << contextid << " , " << description << std::endl;
 
 #endif
 }
@@ -118,7 +126,7 @@ void CAmDltWrapper::init(DltLogLevelType loglevel, DltContext* context)
     dlt_user_log_write_start(context, &mDltContextData, loglevel);
 #else
     if(mEnableNoDLTDebug)
-        std::cout << "\e[0;34m[" << context->contextID << "]\e[0;30m\t";
+        std::cout << SOURCE "[" << context->contextID << "]" NORMAL "\t";
 #endif
 
 }

diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp
index f94a385..2531ddd 100755 (executable)
--- a/AudioManagerDaemon/src/main.cpp
+++ b/AudioManagerDaemon/src/main.cpp
@@ -82,6 +82,13 @@
 #include "shared/CAmDltWrapper.h"
 #include "shared/CAmSocketHandler.h"
 
+#ifdef COLORIZE_LOGS
+#    define SOURCE "\e[0;34m"
+#    define NORMAL "\e[0;30m"
+#else
+#    define SOURCE ""
+#    define NORMAL ""
+#endif
 
 using namespace am;
 DLT_DECLARE_CONTEXT(AudioManager)
@@ -192,15 +199,15 @@ void parseCommandLine(int argc, char **argv)
     {
 #ifdef WITH_DLT
     #ifdef WITH_DBUS_WRAPPER
-            int option = getopt(argc, argv, "h::v::c::l::r::L::R::d::t::m::i::p::T::");
+            int option = getopt(argc, argv, "hvc:l:r:L:R:d:t:m:ip:T:");
     #else
-            int option = getopt(argc, argv, "h::v::c::l::r::L::R::d::t::m::i::p::");
+            int option = getopt(argc, argv, "hvc:l:r:L:R:d:t:m:ip:");
     #endif //WITH_DBUS_WRAPPER
 #else
     #ifdef WITH_DBUS_WRAPPER
-            int option = getopt(argc, argv, "h::v::V::c::l::r::L::R::d::t::m::i::p::T::");
+            int option = getopt(argc, argv, "hvVc:l:r:L:R:d:t:m:ip:T:");
     #else
-            int option = getopt(argc, argv, "h::v::V::c::l::r::L::R::d::t::m::i::p::");
+            int option = getopt(argc, argv, "hvVc:l:r:L:R:d:t:m:ip:");
     #endif //WITH_DBUS_WRAPPER
 #endif
 
@@ -257,7 +264,7 @@ void parseCommandLine(int argc, char **argv)
             break;
 #ifndef WITH_DLT
             case 'V':
-            printf("\e[0;34m[DLT]\e[0;30m\tDebug output to stdout enabled\n");
+            printf(SOURCE "[DLT]" NORMAL "\tDebug output to stdout enabled\n");
             enableNoDLTDebug = true;
             break;
 #endif

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2479b2b..e2e7e4a 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,6 +95,13 @@ OPTION ( WITH_NSM
  OPTION ( WITH_DATABASE_STORAGE
     "build with sqlite as in memory storage" OFF)
 
+OPTION ( COLORIZE_LOGS
+    "colorize logs if we log to stdout" OFF)
+
+IF (COLORIZE_LOGS)
+    SET (COLORIZE_FLAGS -DCOLORIZE_LOGS)
+ENDIF (COLORIZE_LOGS)
+
 SET (WITH_COMMON_API_GEN ON CACHE INTERNAL "hide this!" FORCE)
  
 IF (WITH_ENABLED_IPC STREQUAL "DBUS")
@@ -226,7 +233,7 @@ IF(WITH_DOCUMENTATION)
 ENDIF(WITH_DOCUMENTATION)
 
 ##global build flags set(CPACK_RPM_COMPONENT_INSTALL ON)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -std=gnu++0x -D_GNU_SOURCE -pedantic -Wno-variadic-macros -Wno-long-long")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -std=gnu++0x -D_GNU_SOURCE -pedantic -Wno-variadic-macros -Wno-long-long ${COLORIZE_FLAGS}")
 #set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -std=c++98 -D_GNU_SOURCE")
 
 set (CMAKE_DL_LIBS "${CMAKE_DL_LIBS} -lrt")
@@ -251,6 +258,7 @@ endif(WITH_PLUGIN_ROUTING)
 if(WITH_PLUGIN_CONTROL)
        add_subdirectory (PluginControlInterface)
        add_subdirectory (PluginControlInterfaceDbus)
+        add_subdirectory (PluginControlInterfaceMurphy)
 endif(WITH_PLUGIN_CONTROL)
 
 add_subdirectory (AudioManagerDaemon)