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-08-29 15:07:04 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
901c9590e411ee790badb13bcdc88d9020720e9f
901c9590
1 parent
728b7493
refine log, log important to file. 1.0.210
显示空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
11 行增加
和
4 行删除
trunk/src/app/srs_app_config.cpp
trunk/src/app/srs_app_config.hpp
trunk/src/core/srs_core.hpp
trunk/src/main/srs_main_server.cpp
trunk/src/app/srs_app_config.cpp
查看文件 @
901c959
...
...
@@ -1086,6 +1086,11 @@ int SrsConfig::parse_options(int argc, char** argv)
return
ret
;
}
string
SrsConfig
::
config
()
{
return
config_file
;
}
int
SrsConfig
::
parse_argv
(
int
&
i
,
char
**
argv
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
@@ -1564,9 +1569,6 @@ int SrsConfig::check_config()
}
}
// show important args.
srs_trace
(
"conf: %s, limit: %d"
,
config_file
.
c_str
(),
get_max_connections
());
////////////////////////////////////////////////////////////////////////
// check features
////////////////////////////////////////////////////////////////////////
...
...
trunk/src/app/srs_app_config.hpp
查看文件 @
901c959
...
...
@@ -323,6 +323,10 @@ public:
* parse the cli, the main(argc,argv) function.
*/
virtual
int
parse_options
(
int
argc
,
char
**
argv
);
/**
* get the config file path.
*/
virtual
std
::
string
config
();
private
:
/**
* parse each argv.
...
...
trunk/src/core/srs_core.hpp
查看文件 @
901c959
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "2
09
"
#define VERSION_REVISION "2
10
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
901c959
...
...
@@ -100,6 +100,7 @@ int main(int argc, char** argv)
#ifdef SRS_AUTO_ARM_UBUNTU12
srs_trace
(
"arm tool chain: "
SRS_AUTO_EMBEDED_TOOL_CHAIN
);
#endif
srs_trace
(
"conf: %s, limit: %d"
,
_srs_config
->
config
().
c_str
(),
_srs_config
->
get_max_connections
());
/**
* we do nothing in the constructor of server,
...
...
请
注册
或
登录
后发表评论