tizen 2.4 release

[framework/security/key-manager.git] / src / manager / dpl / log / src / log.cpp

diff --git a/src/manager/dpl/log/src/log.cpp b/src/manager/dpl/log/src/log.cpp
index 1707ebe..d460871 100644 (file)
--- a/src/manager/dpl/log/src/log.cpp
+++ b/src/manager/dpl/log/src/log.cpp
@@ -53,9 +53,7 @@ const char * const CONSOLE =  "CONSOLE";
 const char * const DLOG =     "DLOG";
 const char * const JOURNALD = "JOURNALD";
 
-const char * DEFAULT_PROVIDER = "DLOG";
-const char * DEFAULT_LEVEL = "1";
-
+const char * const NO_ENV_SET = "NO_ENV_VARIABLE";
 } // namespace anonymous
 
 LogSystem::LogSystem() : m_providerCtor({
@@ -66,19 +64,17 @@ LogSystem::LogSystem() : m_providerCtor({
             { JOURNALD, []{ return static_cast<AbstractLogProvider*>(new JournalLogProvider()); } }
     })
 {
-    const char *env_level = getenv(CKM_LOG_LEVEL);
-    if (!env_level)
-        env_level = DEFAULT_LEVEL;
-
-    SetLogLevel(env_level);
+    const char* logLevel = getenv(CKM_LOG_LEVEL);
+    if(logLevel == NULL)
+        logLevel = NO_ENV_SET; // To solve a prevent issue
+    SetLogLevel(logLevel);
 
     AbstractLogProvider* prv = NULL;
+    const char* logProvider = getenv(CKM_LOG_PROVIDER);
+    if(logProvider == NULL)
+        logProvider = NO_ENV_SET; // To solve a prevent issue
     try {
-        const char *env_provider = getenv(CKM_LOG_PROVIDER);
-        if (!env_provider)
-            env_provider = DEFAULT_PROVIDER;
-
-        prv = m_providerCtor.at(env_provider)();
+        prv = m_providerCtor.at(logProvider)();
     } catch(const std::exception&) {
         prv = m_providerCtor[DLOG]();
     }