Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
e7dbc4ff
Commit
e7dbc4ff
authored
Jun 11, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14782 from alalek:core_fix_log_level_default
parents
b4d3ff37
6c8ffe81
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
logger.cpp
modules/core/src/logger.cpp
+1
-1
logtagconfigparser.cpp
modules/core/src/utils/logtagconfigparser.cpp
+2
-2
logtagconfigparser.hpp
modules/core/src/utils/logtagconfigparser.hpp
+1
-1
logtagmanager.cpp
modules/core/src/utils/logtagmanager.cpp
+1
-1
No files found.
modules/core/src/logger.cpp
View file @
e7dbc4ff
...
...
@@ -75,7 +75,7 @@ private:
};
LogLevel
GlobalLoggingInitStruct
::
m_defaultUnconfiguredGlobalLevel
=
GlobalLoggingInitStruct
::
m_isDebugBuild
?
LOG_LEVEL_
DEBUG
?
LOG_LEVEL_
INFO
:
LOG_LEVEL_WARNING
;
...
...
modules/core/src/utils/logtagconfigparser.cpp
View file @
e7dbc4ff
...
...
@@ -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
)
...
...
modules/core/src/utils/logtagconfigparser.hpp
View file @
e7dbc4ff
...
...
@@ -21,7 +21,7 @@ namespace logging {
class
LogTagConfigParser
{
public
:
LogTagConfigParser
();
LogTagConfigParser
(
LogLevel
defaultUnconfiguredGlobalLevel
=
LOG_LEVEL_VERBOSE
);
explicit
LogTagConfigParser
(
const
std
::
string
&
input
);
~
LogTagConfigParser
();
...
...
modules/core/src/utils/logtagmanager.cpp
View file @
e7dbc4ff
...
...
@@ -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
());
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment