Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-04-10 14:20:02 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ccba9ba9ba1a24ecedaa20f30c60f28681b7183f
ccba9ba9
1 parent
f2f30dcc
move log level parse to app utility
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
27 行增加
和
13 行删除
trunk/src/app/srs_app_utility.cpp
trunk/src/app/srs_app_utility.hpp
trunk/src/main/srs_main_server.cpp
trunk/src/app/srs_app_utility.cpp
查看文件 @
ccba9ba
...
...
@@ -22,3 +22,23 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <srs_app_utility.hpp>
#include <srs_kernel_log.hpp>
#include <srs_app_config.hpp>
int
srs_get_log_level
(
std
::
string
level
)
{
if
(
"verbose"
==
_srs_config
->
get_srs_log_level
())
{
return
SrsLogLevel
::
Verbose
;
}
else
if
(
"info"
==
_srs_config
->
get_srs_log_level
())
{
return
SrsLogLevel
::
Info
;
}
else
if
(
"trace"
==
_srs_config
->
get_srs_log_level
())
{
return
SrsLogLevel
::
Trace
;
}
else
if
(
"warn"
==
_srs_config
->
get_srs_log_level
())
{
return
SrsLogLevel
::
Warn
;
}
else
if
(
"error"
==
_srs_config
->
get_srs_log_level
())
{
return
SrsLogLevel
::
Error
;
}
else
{
return
SrsLogLevel
::
Trace
;
}
}
...
...
trunk/src/app/srs_app_utility.hpp
查看文件 @
ccba9ba
...
...
@@ -30,4 +30,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp>
/**
* convert level in string to log level in int.
* @return the log level defined in SrsLogLevel.
*/
extern
int
srs_get_log_level
(
std
::
string
level
);
#endif
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
ccba9ba
...
...
@@ -164,19 +164,7 @@ int main(int argc, char** argv)
}
// config parsed, initialize log.
if
(
"verbose"
==
_srs_config
->
get_srs_log_level
())
{
_srs_log
->
set_level
(
SrsLogLevel
::
Verbose
);
}
else
if
(
"info"
==
_srs_config
->
get_srs_log_level
())
{
_srs_log
->
set_level
(
SrsLogLevel
::
Info
);
}
else
if
(
"trace"
==
_srs_config
->
get_srs_log_level
())
{
_srs_log
->
set_level
(
SrsLogLevel
::
Trace
);
}
else
if
(
"warn"
==
_srs_config
->
get_srs_log_level
())
{
_srs_log
->
set_level
(
SrsLogLevel
::
Warn
);
}
else
if
(
"error"
==
_srs_config
->
get_srs_log_level
())
{
_srs_log
->
set_level
(
SrsLogLevel
::
Error
);
}
else
{
_srs_log
->
set_level
(
SrsLogLevel
::
Trace
);
}
_srs_log
->
set_level
(
srs_get_log_level
(
_srs_config
->
get_srs_log_level
()));
srs_trace
(
"srs(simple-rtmp-server) "
RTMP_SIG_SRS_VERSION
);
srs_trace
(
"uname: "
SRS_UNAME
);
...
...
请
注册
或
登录
后发表评论