From b8177ff2fb10c41bdcfbddae9b26c6245360a48a Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 14 Aug 2021 08:56:43 +0800 Subject: [PATCH] Release v3.0-r8, 3.0.168 --- README.md | 5 ++++- trunk/src/app/srs_app_latest_version.cpp | 19 +++++++++---------- trunk/src/core/srs_core_version3.hpp | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index b3aacf2e8..7d9ec939f 100755 --- a/README.md +++ b/README.md @@ -129,6 +129,7 @@ Other important wiki: ## V3 changes +* v3.0, 2021-08-14, [3.0 release8(3.0.168)](https://github.com/ossrs/srs/releases/tag/v3.0-r8) released. 124469 lines. * v3.0, 2021-07-04, [3.0 release7(3.0.164)](https://github.com/ossrs/srs/releases/tag/v3.0-r7) released. 123463 lines. * v3.0, 2021-07-04, For [#2424](https://github.com/ossrs/srs/issues/2424), use srandom/random to generate. 3.0.164 * v3.0, 2021-06-26, [3.0 release6(3.0.163)](https://github.com/ossrs/srs/releases/tag/v3.0-r6) released. 123011 lines. @@ -336,7 +337,8 @@ Other important wiki: ## V2 changes -* 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 @@ -778,6 +780,7 @@ Other important wiki: ## Releases +* 2021-08-14, [Release v3.0-r8](https://github.com/ossrs/srs/releases/tag/v3.0-r8), 3.0 release8, 3.0.168, 124469 lines. * 2021-07-04, [Release v3.0-r7](https://github.com/ossrs/srs/releases/tag/v3.0-r7), 3.0 release7, 3.0.167, 123463 lines. * 2021-06-26, [Release v3.0-r6](https://github.com/ossrs/srs/releases/tag/v3.0-r6), 3.0 release6, 3.0.163, 123011 lines. * 2021-04-28, [Release v3.0-r5][r3.0r5], 3.0 release5, 3.0.161, 122750 lines. diff --git a/trunk/src/app/srs_app_latest_version.cpp b/trunk/src/app/srs_app_latest_version.cpp index fce658795..d67f40af4 100644 --- a/trunk/src/app/srs_app_latest_version.cpp +++ b/trunk/src/app/srs_app_latest_version.cpp @@ -82,21 +82,18 @@ srs_error_t SrsLatestVersion::cycle() { srs_error_t err = srs_success; - srs_utime_t starttime = srs_update_system_time(); - if ((err = query_latest_version()) != srs_success) { - srs_warn("query err %s", srs_error_desc(err).c_str()); - srs_freep(err); // Ignore any error. - } - srs_utime_t first_random_wait = 0; srs_random_generate((char*)&first_random_wait, 8); - first_random_wait = srs_utime_t(uint64_t((first_random_wait + starttime + getpid())) % (60 * 60)) * SRS_UTIME_SECONDS; // in s. + first_random_wait = srs_utime_t(uint64_t((first_random_wait + srs_update_system_time() + getpid())) % (5 * 60)) * SRS_UTIME_SECONDS; // in s. - srs_trace("Startup query id=%s, eip=%s, match=%s, stable=%s, wait=%ds, cost=%dms", server_id_.c_str(), srs_get_public_internet_address().c_str(), match_version_.c_str(), stable_version_.c_str(), srsu2msi(first_random_wait)/1000, srsu2msi(srs_update_system_time() - starttime)); + // Only report after 5+ minutes. + first_random_wait += 5 * 60 * SRS_UTIME_SECONDS; + + srs_trace("Startup query id=%s, eip=%s, wait=%ds", server_id_.c_str(), srs_get_public_internet_address().c_str(), srsu2msi(first_random_wait)/1000); srs_usleep(first_random_wait); while (true) { - starttime = srs_update_system_time(); + srs_utime_t starttime = srs_update_system_time(); if ((err = query_latest_version()) != srs_success) { srs_warn("query err %s", srs_error_desc(err).c_str()); srs_freep(err); // Ignore any error. @@ -119,8 +116,10 @@ srs_error_t SrsLatestVersion::query_latest_version() << "version=v" << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_REVISION << "&id=" << server_id_ << "&role=srs" << "&eip=" << srs_get_public_internet_address() - << "&ts=" << srsu2ms(srs_get_system_time()); + << "&ts=" << srs_get_system_time() + << "&alive=" << srsu2ms(srs_get_system_time() - srs_get_system_startup_time()) / 1000; srs_build_features(ss); + string url = ss.str(); SrsHttpUri uri; diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp index 90289f055..838281207 100644 --- a/trunk/src/core/srs_core_version3.hpp +++ b/trunk/src/core/srs_core_version3.hpp @@ -24,6 +24,6 @@ #ifndef SRS_CORE_VERSION3_HPP #define SRS_CORE_VERSION3_HPP -#define SRS_VERSION3_REVISION 166 +#define SRS_VERSION3_REVISION 168 #endif