Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix typo about heartbeat #4253

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix typo about heartbeat #4253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions trunk/src/app/srs_app_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -8708,7 +8708,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");
}
Expand All @@ -8719,7 +8719,7 @@ bool SrsConfig::get_heartbeat_enabled()

static bool DEFAULT = false;

SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}
Expand All @@ -8738,7 +8738,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;
}
Expand All @@ -8757,7 +8757,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;
}
Expand All @@ -8776,7 +8776,7 @@ string SrsConfig::get_heartbeat_device_id()

static string DEFAULT = "";

SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}
Expand All @@ -8795,7 +8795,7 @@ bool SrsConfig::get_heartbeat_summaries()

static bool DEFAULT = false;

SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}
Expand All @@ -8814,7 +8814,7 @@ bool SrsConfig::get_heartbeat_ports()

static bool DEFAULT = false;

SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/src/app/srs_app_config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,10 +1104,10 @@ class SrsConfig
// Get the http flv live stream mount point for vhost.
// used to generate the flv stream mount path.
virtual std::string get_vhost_http_remux_mount(std::string vhost);
// http heartbeart section
// http heartbeat section
private:
// Get the heartbeat directive.
virtual SrsConfDirective* get_heartbeart();
virtual SrsConfDirective* get_heartbeat();
public:
// Whether heartbeat enabled.
virtual bool get_heartbeat_enabled();
Expand Down
Loading