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-03-23 14:51:35 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ed20bd707851e2590f0b67269fd95df0724980ac
ed20bd70
1 parent
76290a5a
default write log to file.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
12 行增加
和
10 行删除
trunk/conf/full.conf
trunk/src/app/srs_app_config.cpp
trunk/src/main/srs_main_server.cpp
trunk/conf/full.conf
查看文件 @
ed20bd7
...
...
@@ -21,8 +21,10 @@ ff_log_dir ./objs/logs;
# the log tank, console or file.
# if console, print log to console.
# if file, write log to file. requires srs_log_file if log to file.
# default: console.
srs_log_tank
console
;
# default: file.
srs_log_tank
file
;
# when srs_log_tank is file, specifies the log file.
# default: ./objs/srs.log
srs_log_file
./
objs
/
srs
.
log
;
# the max connections.
# if exceed the max connections, server will drop the new connection.
...
...
trunk/src/app/srs_app_config.cpp
查看文件 @
ed20bd7
...
...
@@ -1282,7 +1282,7 @@ string SrsConfig::get_srs_log_file()
SrsConfDirective
*
conf
=
root
->
get
(
"srs_log_file"
);
if
(
!
conf
||
conf
->
arg0
().
empty
())
{
return
""
;
return
"
./objs/srs.log
"
;
}
return
conf
->
arg0
();
...
...
@@ -1293,11 +1293,11 @@ bool SrsConfig::get_srs_log_tank_file()
srs_assert
(
root
);
SrsConfDirective
*
conf
=
root
->
get
(
"srs_log_tank"
);
if
(
conf
&&
conf
->
arg0
()
==
"file"
)
{
return
true
;
if
(
conf
&&
conf
->
arg0
()
==
"console"
)
{
return
false
;
}
return
fals
e
;
return
tru
e
;
}
bool
SrsConfig
::
get_deamon
()
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
ed20bd7
...
...
@@ -61,6 +61,10 @@ int run_master()
signal
(
SIGTERM
,
handler
);
signal
(
SIGINT
,
handler
);
if
((
ret
=
_srs_server
->
acquire_pid_file
())
!=
ERROR_SUCCESS
)
{
return
ret
;
}
if
((
ret
=
_srs_server
->
initialize_st
())
!=
ERROR_SUCCESS
)
{
return
ret
;
}
...
...
@@ -161,9 +165,5 @@ int main(int argc, char** argv)
return
ret
;
}
if
((
ret
=
_srs_server
->
acquire_pid_file
())
!=
ERROR_SUCCESS
)
{
return
ret
;
}
return
run
();
}
...
...
请
注册
或
登录
后发表评论