external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Fix #1352, fix typo of daemon.

Browse source
This commit is contained in:
winlin 2019-05-07 07:46:20 +08:00
parent ffe391aa49
commit 5d8fb01b45
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/main/srs_main_server.cpp
View file

@ -378,15 +378,15 @@ srs_error_t run(SrsServer* svr)
return srs_error_wrap(err, "server initialize");
}
// If not deamon, directly run master.
if (!_srs_config->get_deamon()) {
// If not daemon, directly run master.
if (!_srs_config->get_daemon()) {
if ((err = run_master(svr)) != srs_success) {
return srs_error_wrap(err, "run master");
}
return srs_success;
}
srs_trace("start deamon mode...");
srs_trace("start daemon mode...");
int pid = fork();
@ -415,7 +415,7 @@ srs_error_t run(SrsServer* svr)
}
// son
srs_trace("son(deamon) process running.");
srs_trace("son(daemon) process running.");
if ((err = run_master(svr)) != srs_success) {
return srs_error_wrap(err, "daemon run master");