From 9851a988faf8c41f0d0853e28d1f63024cb30859 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 14 Aug 2021 08:56:43 +0800 Subject: [PATCH] Release v2.0-r11, 2.0.276 --- README.md | 4 +++- trunk/src/app/srs_app_latest_version.cpp | 13 +++++++------ trunk/src/core/srs_core.hpp | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6179fba1e..27f770e4a 100755 --- a/README.md +++ b/README.md @@ -295,6 +295,7 @@ Remark: ## Releases +* 2021-08-14, [Release v2.0-r11](https://github.com/ossrs/srs/releases/tag/v2.0-r11), 2.0 release11, 2.0.276, 89013 lines. * 2021-07-04, [Release v2.0-r10](https://github.com/ossrs/srs/releases/tag/v2.0-r10), 2.0 release10, 2.0.274, 87575 lines. * 2021-06-26, [Release v2.0-r9](https://github.com/ossrs/srs/releases/tag/v2.0-r9), 2.0 release9, 2.0.273, 87552 lines. * 2020-01-25, [Release v2.0-r8][r2.0r8], 2.0 release8, 2.0.272, 87292 lines. @@ -341,7 +342,8 @@ Remark: ## History -* v2.0, 2021-07-04, [2.0 release9(2.0.274)](https://github.com/ossrs/srs/releases/tag/v2.0-r10) released. 87575 lines. +* v2.0, 2021-08-14, [2.0 release11(2.0.276)](https://github.com/ossrs/srs/releases/tag/v2.0-r11) released. 89013 lines. +* v2.0, 2021-07-04, [2.0 release10(2.0.274)](https://github.com/ossrs/srs/releases/tag/v2.0-r10) released. 87575 lines. * v2.0, 2021-07-04, For [#2424](https://github.com/ossrs/srs/issues/2424), use srandom/random to generate. 2.0.274 * v2.0, 2021-06-26, [2.0 release9(2.0.273)](https://github.com/ossrs/srs/releases/tag/v2.0-r9) released. 87552 lines. * v2.0, 2021-06-25, For [#2424](https://github.com/ossrs/srs/issues/2424), query the latest available version. 2.0.273 diff --git a/trunk/src/app/srs_app_latest_version.cpp b/trunk/src/app/srs_app_latest_version.cpp index ba2d6fbc6..638ac5562 100644 --- a/trunk/src/app/srs_app_latest_version.cpp +++ b/trunk/src/app/srs_app_latest_version.cpp @@ -73,14 +73,14 @@ int SrsLatestVersion::cycle() { int ret = ERROR_SUCCESS; - int64_t starttime = srs_update_system_time_ms(); - ret = query_latest_version(); // Ignore any error. - uint64_t first_random_wait = 0; srs_random_generate((char*)&first_random_wait, 8); - first_random_wait = (first_random_wait + starttime + getpid()) % (60 * 60); // in s. + first_random_wait = (first_random_wait + srs_update_system_time_ms() + getpid()) % (5 * 60); // in s. + + // Only report after 5+ minutes. + first_random_wait += 5 * 60; - srs_trace("Startup query id=%s, eip=%s, match=%s, stable=%s, wait=%ds, cost=%dms, ret=%d", server_id_.c_str(), srs_get_public_internet_address().c_str(), match_version_.c_str(), stable_version_.c_str(), (int)first_random_wait, (int)(srs_update_system_time_ms() - starttime), ret); + srs_trace("Startup query id=%s, eip=%s, wait=%ds", server_id_.c_str(), srs_get_public_internet_address().c_str(), (int)first_random_wait); st_usleep(first_random_wait * 1000 * 1000); while (true) { @@ -104,7 +104,8 @@ int SrsLatestVersion::query_latest_version() << "version=v" << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_REVISION << "&id=" << server_id_ << "&eip=" << srs_get_public_internet_address() - << "&ts=" << srs_get_system_time_ms(); + << "&ts=" << srs_get_system_time_ms() + << "&alive=" << (srs_get_system_time_ms() - srs_get_system_startup_time_ms()) / 1000; string url = ss.str(); SrsHttpUri uri; diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 658f3ed9e..03edf01d5 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 275 +#define VERSION_REVISION 276 // generated by configure, only macros. #include