Skip to content

Commit 9851a98

Browse files
committed
Release v2.0-r11, 2.0.276
1 parent dca3158 commit 9851a98

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ Remark:
295295

296296
## Releases
297297

298+
* 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.
298299
* 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.
299300
* 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.
300301
* 2020-01-25, [Release v2.0-r8][r2.0r8], 2.0 release8, 2.0.272, 87292 lines.
@@ -341,7 +342,8 @@ Remark:
341342

342343
## History
343344

344-
* <strong>v2.0, 2021-07-04, [2.0 release9(2.0.274)](https://github.com/ossrs/srs/releases/tag/v2.0-r10) released. 87575 lines.</strong>
345+
* <strong>v2.0, 2021-08-14, [2.0 release11(2.0.276)](https://github.com/ossrs/srs/releases/tag/v2.0-r11) released. 89013 lines.</strong>
346+
* <strong>v2.0, 2021-07-04, [2.0 release10(2.0.274)](https://github.com/ossrs/srs/releases/tag/v2.0-r10) released. 87575 lines.</strong>
345347
* v2.0, 2021-07-04, For [#2424](https://github.com/ossrs/srs/issues/2424), use srandom/random to generate. 2.0.274
346348
* <strong>v2.0, 2021-06-26, [2.0 release9(2.0.273)](https://github.com/ossrs/srs/releases/tag/v2.0-r9) released. 87552 lines.</strong>
347349
* v2.0, 2021-06-25, For [#2424](https://github.com/ossrs/srs/issues/2424), query the latest available version. 2.0.273

trunk/src/app/srs_app_latest_version.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ int SrsLatestVersion::cycle()
7373
{
7474
int ret = ERROR_SUCCESS;
7575

76-
int64_t starttime = srs_update_system_time_ms();
77-
ret = query_latest_version(); // Ignore any error.
78-
7976
uint64_t first_random_wait = 0;
8077
srs_random_generate((char*)&first_random_wait, 8);
81-
first_random_wait = (first_random_wait + starttime + getpid()) % (60 * 60); // in s.
78+
first_random_wait = (first_random_wait + srs_update_system_time_ms() + getpid()) % (5 * 60); // in s.
79+
80+
// Only report after 5+ minutes.
81+
first_random_wait += 5 * 60;
8282

83-
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);
83+
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);
8484
st_usleep(first_random_wait * 1000 * 1000);
8585

8686
while (true) {
@@ -104,7 +104,8 @@ int SrsLatestVersion::query_latest_version()
104104
<< "version=v" << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_REVISION
105105
<< "&id=" << server_id_
106106
<< "&eip=" << srs_get_public_internet_address()
107-
<< "&ts=" << srs_get_system_time_ms();
107+
<< "&ts=" << srs_get_system_time_ms()
108+
<< "&alive=" << (srs_get_system_time_ms() - srs_get_system_startup_time_ms()) / 1000;
108109
string url = ss.str();
109110

110111
SrsHttpUri uri;

trunk/src/core/srs_core.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3131
// current release version
3232
#define VERSION_MAJOR 2
3333
#define VERSION_MINOR 0
34-
#define VERSION_REVISION 275
34+
#define VERSION_REVISION 276
3535

3636
// generated by configure, only macros.
3737
#include <srs_auto_headers.hpp>

0 commit comments

Comments
 (0)