core: repair default log level

ywscr · Jun 11, 2019 · 6c8ffe8 · 6c8ffe8
1 parent 3f67623
commit 6c8ffe8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/modules/core/src/logger.cpp b/modules/core/src/logger.cpp
@@ -75,7 +75,7 @@ struct GlobalLoggingInitStruct
 };
 
 LogLevel GlobalLoggingInitStruct::m_defaultUnconfiguredGlobalLevel = GlobalLoggingInitStruct::m_isDebugBuild
-                ? LOG_LEVEL_DEBUG
+                ? LOG_LEVEL_INFO
                 : LOG_LEVEL_WARNING;
 
 

diff --git a/modules/core/src/utils/logtagconfigparser.cpp b/modules/core/src/utils/logtagconfigparser.cpp
@@ -9,13 +9,13 @@ namespace cv {
 namespace utils {
 namespace logging {
 
-LogTagConfigParser::LogTagConfigParser()
+LogTagConfigParser::LogTagConfigParser(LogLevel defaultUnconfiguredGlobalLevel)
 {
     m_parsedGlobal.namePart = "global";
     m_parsedGlobal.isGlobal = true;
     m_parsedGlobal.hasPrefixWildcard = false;
     m_parsedGlobal.hasSuffixWildcard = false;
-    m_parsedGlobal.level = LOG_LEVEL_VERBOSE;
+    m_parsedGlobal.level = defaultUnconfiguredGlobalLevel;
 }
 
 LogTagConfigParser::LogTagConfigParser(const std::string& input)

diff --git a/modules/core/src/utils/logtagconfigparser.hpp b/modules/core/src/utils/logtagconfigparser.hpp
@@ -21,7 +21,7 @@ namespace logging {
 class LogTagConfigParser
 {
 public:
-    LogTagConfigParser();
+    LogTagConfigParser(LogLevel defaultUnconfiguredGlobalLevel = LOG_LEVEL_VERBOSE);
     explicit LogTagConfigParser(const std::string& input);
     ~LogTagConfigParser();
 

diff --git a/modules/core/src/utils/logtagmanager.cpp b/modules/core/src/utils/logtagmanager.cpp
@@ -17,7 +17,7 @@ const char* LogTagManager::m_globalName = "global";
 LogTagManager::LogTagManager(LogLevel defaultUnconfiguredGlobalLevel)
     : m_mutex()
     , m_globalLogTag(new LogTag(m_globalName, defaultUnconfiguredGlobalLevel))
-    , m_config(std::make_shared<LogTagConfigParser>())
+    , m_config(std::make_shared<LogTagConfigParser>(defaultUnconfiguredGlobalLevel))
 {
     assign(m_globalName, m_globalLogTag.get());
 }