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 'develop' into bugfix/bug-summary

Browse source
This commit is contained in:
sangbumlikeagod 2025-02-22 22:24:13 +09:00 • committed by GitHub
commit a9694ac90c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
364 changed files with 387 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

18
trunk/src/app/srs_app_config.cpp
View file

@ -1,5 +1,5 @@
//
// Copyright (c) 2013-2024 The SRS Authors
// Copyright (c) 2013-2025 The SRS Authors
//
// SPDX-License-Identifier: MIT
//
@ -2405,7 +2405,7 @@ srs_error_t SrsConfig::check_normal_config()
}
}
if (true) {
SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
for (int i = 0; conf && i < (int)conf->directives.size(); i++) {
string n = conf->at(i)->name;
if (n != "enabled" && n != "interval" && n != "url"
@ -8840,7 +8840,7 @@ string SrsConfig::get_vhost_http_remux_mount(string vhost)
return conf->arg0();
}
SrsConfDirective* SrsConfig::get_heartbeart()
SrsConfDirective* SrsConfig::get_heartbeat()
{
return root->get("heartbeat");
}
@ -8851,7 +8851,7 @@ bool SrsConfig::get_heartbeat_enabled()
static bool DEFAULT = false;
SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}
@ -8870,7 +8870,7 @@ srs_utime_t SrsConfig::get_heartbeat_interval()
static srs_utime_t DEFAULT = (srs_utime_t)(10 * SRS_UTIME_SECONDS);
SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}
@ -8889,7 +8889,7 @@ string SrsConfig::get_heartbeat_url()
static string DEFAULT = "http://" SRS_CONSTS_LOCALHOST ":8085/api/v1/servers";
SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}
@ -8908,7 +8908,7 @@ string SrsConfig::get_heartbeat_device_id()
static string DEFAULT = "";
SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}
@ -8927,7 +8927,7 @@ bool SrsConfig::get_heartbeat_summaries()
static bool DEFAULT = false;
SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}
@ -8946,7 +8946,7 @@ bool SrsConfig::get_heartbeat_ports()
static bool DEFAULT = false;
SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}