From d22d7afd8376b9de8a273e5f3ea3f05fe7d13386 Mon Sep 17 00:00:00 2001 From: RocFang Date: Thu, 4 Jan 2018 13:45:56 +0800 Subject: [PATCH 1/2] update init.d file (#1039) --- trunk/etc/init.d/srs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/etc/init.d/srs b/trunk/etc/init.d/srs index d5dfcb1cd..9ef98e75f 100755 --- a/trunk/etc/init.d/srs +++ b/trunk/etc/init.d/srs @@ -62,7 +62,7 @@ load_process_info() { start() { # if exists, exit. load_process_info - if [[ 0 -eq $? ]]; then failed_msg "SRS started(pid ${srs_pid}), should not start it again."; return 0; fi + if [[ 0 -eq $? ]]; then failed_msg "SRS started(pid ${srs_pid}), should not start it again."; return 1; fi # not exists, start server ok_msg "Starting SRS..." @@ -95,7 +95,7 @@ start() { # check whether started. load_process_info - ret=$?; if [[ 0 -eq $? ]]; then ok_msg "SRS started(pid ${srs_pid})"; return 0; fi + ret=$?; if [[ 0 -eq $ret ]]; then ok_msg "SRS started(pid ${srs_pid})"; return 0; fi failed_msg "SRS not started" return $ret From a6bc53cb856cd7b8221c66b127bf4a06a2cc8379 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 4 Jan 2018 13:49:11 +0800 Subject: [PATCH 2/2] Merge #1039, fix bug of init.d script. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9229f92e6..e28ca9d68 100755 --- a/README.md +++ b/README.md @@ -332,6 +332,7 @@ Remark: ## History +* v2.0, 2018-01-04, Merge [#1039][bug #1039], fix bug of init.d script. * v2.0, 2018-01-01, Merge [#1033][bug #1033], allow user to add some specific flags. 2.0.244 * v2.0, 2017-06-10, [2.0 release2(2.0.243)][r2.0r2] released. 86670 lines. * v2.0, 2017-05-29, Merge [#899][bug #899] to fix [#893][bug #893], ts PES ext length. 2.0.243 @@ -1298,6 +1299,7 @@ Winlin [bug #893]: https://github.com/ossrs/srs/issues/893 [bug #899]: https://github.com/ossrs/srs/issues/899 [bug #1033]: https://github.com/ossrs/srs/issues/1033 +[bug #1039]: https://github.com/ossrs/srs/issues/1039 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [exo #828]: https://github.com/google/ExoPlayer/pull/828