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

Merge branch '3.0release' into 4.0release

Browse source
This commit is contained in:
winlin 2020-02-18 22:15:29 +08:00
commit 0c48c42f36
6 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
trunk/src/app/srs_app_server.cpp
View file

@ -915,7 +915,14 @@ void SrsServer::on_signal(int signo)
#endif
#endif
}
// For K8S, force to gracefully quit for gray release or canary.
// @see https://github.com/ossrs/srs/issues/1595#issuecomment-587473037
if (signo == SRS_SIGNAL_FAST_QUIT && _srs_config->is_force_grace_quit()) {
srs_trace("force gracefully quit, signo=%d", signo);
signo = SRS_SIGNAL_GRACEFULLY_QUIT;
}
if ((signo == SIGINT || signo == SRS_SIGNAL_FAST_QUIT) && !signal_fast_quit) {
srs_trace("sig=%d, user terminate program, fast quit", signo);
signal_fast_quit = true;