github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

support reload http_api

Browse Source
pull/133/head
winlin 11 years ago
parent 17ac29d160
commit c33ff4fdb8
6 changed files with 159 additions and 49 deletions
Show Stats Download Patch File Download Diff File

177
trunk/src/app/srs_app_config.cpp
Unescape Escape View File

@ -567,82 +567,158 @@ int SrsConfig::reload()
}
srs_trace("reload pithy_print success.");
}
// merge config: http_api
if ((ret = reload_http_api(old_root)) != ERROR_SUCCESS) {
return ret;
}
// merge config: vhost added
for (int i = 0; i < (int)root->directives.size(); i++) {
// ingest need to start if specified.
// other features, directly supported.
SrsConfDirective* new_vhost = root->at(i);
// only process vhost directives.
if (new_vhost->name != "vhost") {
continue;
}
std::string vhost = new_vhost->arg0();
// not new added vhost, ignore.
if (old_root->get("vhost", vhost)) {
continue;
// merge config: vhost
if ((ret = reload_vhost(old_root)) != ERROR_SUCCESS) {
return ret;
}
return ret;
}
int SrsConfig::reload_http_api(SrsConfDirective* old_root)
{
int ret = ERROR_SUCCESS;
// merge config.
std::vector<ISrsReloadHandler*>::iterator it;
// state graph
// old_http_api new_http_api
// DISABLED => ENABLED
// ENABLED => DISABLED
// ENABLED => ENABLED (modified)
SrsConfDirective* new_http_api = root->get("http_api");
SrsConfDirective* old_http_api = old_root->get("http_api");
// DISABLED => ENABLED
if (!get_http_api_enabled(old_http_api) && get_http_api_enabled(new_http_api)) {
for (it = subscribes.begin(); it != subscribes.end(); ++it) {
ISrsReloadHandler* subscribe = *it;
if ((ret = subscribe->on_reload_http_api_enabled()) != ERROR_SUCCESS) {
srs_error("notify subscribes http_api disabled=>enabled failed. ret=%d", ret);
return ret;
}
}
srs_trace("reload disabled=>enabled http_api success.");
srs_trace("vhost %s added, reload it.", vhost.c_str());
return ret;
}
// ENABLED => DISABLED
if (get_http_api_enabled(old_http_api) && !get_http_api_enabled(new_http_api)) {
for (it = subscribes.begin(); it != subscribes.end(); ++it) {
ISrsReloadHandler* subscribe = *it;
if ((ret = subscribe->on_reload_vhost_added(vhost)) != ERROR_SUCCESS) {
srs_error("notify subscribes pithy_print remove "
"vhost %s failed. ret=%d", vhost.c_str(), ret);
if ((ret = subscribe->on_reload_http_api_disabled()) != ERROR_SUCCESS) {
srs_error("notify subscribes http_api enabled=>disabled failed. ret=%d", ret);
return ret;
}
}
srs_trace("reload new vhost %s success.", vhost.c_str());
srs_trace("reload enabled=>disabled http_api success.");
return ret;
}
// merge config: vhost removed/disabled/modified.
for (int i = 0; i < (int)old_root->directives.size(); i++) {
SrsConfDirective* old_vhost = old_root->at(i);
// only process vhost directives.
if (old_vhost->name != "vhost") {
continue;
// ENABLED => ENABLED (modified)
if (get_http_api_enabled(old_http_api) && get_http_api_enabled(new_http_api)
&& !srs_directive_equals(old_http_api, new_http_api)
) {
for (it = subscribes.begin(); it != subscribes.end(); ++it) {
ISrsReloadHandler* subscribe = *it;
if ((ret = subscribe->on_reload_http_api_enabled()) != ERROR_SUCCESS) {
srs_error("notify subscribes http_api enabled modified failed. ret=%d", ret);
return ret;
}
}
srs_trace("reload enabled modified http_api success.");
std::string vhost = old_vhost->arg0();
return ret;
}
srs_trace("reload http_api not changed success.");
return ret;
}
SrsConfDirective* new_vhost = root->get("vhost", vhost);
// ignore if absolutely equal
if (new_vhost && srs_directive_equals(old_vhost, new_vhost)) {
srs_trace("vhost %s absolutely equal, ignore.", vhost.c_str());
int SrsConfig::reload_vhost(SrsConfDirective* old_root)
{
int ret = ERROR_SUCCESS;
// merge config.
std::vector<ISrsReloadHandler*>::iterator it;
// state graph
// old_vhost new_vhost
// DISABLED => ENABLED
// ENABLED => DISABLED
// ENABLED => ENABLED (modified)
// collect all vhost names
std::vector<std::string> vhosts;
for (int i = 0; i < (int)root->directives.size(); i++) {
SrsConfDirective* vhost = root->at(i);
if (vhost->name != "vhost") {
continue;
}
// ignore if enable the new vhost when old vhost is disabled.
if (get_vhost_enabled(new_vhost) && !get_vhost_enabled(old_vhost)) {
srs_trace("vhost %s disabled=>enabled, ignore.", vhost.c_str());
vhosts.push_back(vhost->arg0());
}
for (int i = 0; i < (int)old_root->directives.size(); i++) {
SrsConfDirective* vhost = old_root->at(i);
if (vhost->name != "vhost") {
continue;
}
// ignore if both old and new vhost are disabled.
if (!get_vhost_enabled(new_vhost) && !get_vhost_enabled(old_vhost)) {
srs_trace("vhost %s disabled=>disabled, ignore.", vhost.c_str());
if (root->get("vhost", vhost->arg0())) {
continue;
}
vhosts.push_back(vhost->arg0());
}
// process each vhost
for (int i = 0; i < (int)vhosts.size(); i++) {
std::string vhost = vhosts.at(i);
// merge config: vhost removed/disabled.
if (!get_vhost_enabled(new_vhost) && get_vhost_enabled(old_vhost)) {
srs_trace("vhost %s disabled, reload it.", vhost.c_str());
SrsConfDirective* old_vhost = old_root->get("vhost", vhost);
SrsConfDirective* new_vhost = root->get("vhost", vhost);
// DISABLED => ENABLED
if (!get_vhost_enabled(old_vhost) && get_vhost_enabled(new_vhost)) {
srs_trace("vhost %s added, reload it.", vhost.c_str());
for (it = subscribes.begin(); it != subscribes.end(); ++it) {
ISrsReloadHandler* subscribe = *it;
if ((ret = subscribe->on_reload_vhost_removed(vhost)) != ERROR_SUCCESS) {
srs_error("notify subscribes pithy_print remove "
if ((ret = subscribe->on_reload_vhost_added(vhost)) != ERROR_SUCCESS) {
srs_error("notify subscribes added "
"vhost %s failed. ret=%d", vhost.c_str(), ret);
return ret;
}
}
srs_trace("reload remove vhost %s success.", vhost.c_str());
srs_trace("reload new vhost %s success.", vhost.c_str());
continue;
}
// merge config: vhost modified.
srs_trace("vhost %s modified, reload its detail.", vhost.c_str());
// ENABLED => DISABLED
if (get_vhost_enabled(old_vhost) && !get_vhost_enabled(new_vhost)) {
srs_trace("vhost %s removed, reload it.", vhost.c_str());
for (it = subscribes.begin(); it != subscribes.end(); ++it) {
ISrsReloadHandler* subscribe = *it;
if ((ret = subscribe->on_reload_vhost_removed(vhost)) != ERROR_SUCCESS) {
srs_error("notify subscribes removed "
"vhost %s failed. ret=%d", vhost.c_str(), ret);
return ret;
}
}
srs_trace("reload removed vhost %s success.", vhost.c_str());
continue;
}
// ENABLED => ENABLED (modified)
if (get_vhost_enabled(new_vhost) && get_vhost_enabled(old_vhost)) {
srs_trace("vhost %s modified, reload its detail.", vhost.c_str());
// atc, only one per vhost
if (!srs_directive_equals(new_vhost->get("atc"), old_vhost->get("atc"))) {
for (it = subscribes.begin(); it != subscribes.end(); ++it) {
@ -706,10 +782,9 @@ int SrsConfig::reload()
if ((ret = reload_ingest(new_vhost, old_vhost)) != ERROR_SUCCESS) {
return ret;
}
// TODO: suppor reload hls/forward/ffmpeg/http
continue;
}
srs_warn("invalid reload path, enabled old: %d, new: %d",
srs_trace("igreno reload vhost, enabled old: %d, new: %d",
get_vhost_enabled(old_vhost), get_vhost_enabled(new_vhost));
}
@ -2116,7 +2191,11 @@ SrsConfDirective* SrsConfig::get_http_api()
bool SrsConfig::get_http_api_enabled()
{
SrsConfDirective* conf = get_http_api();
return get_http_api_enabled(conf);
}
bool SrsConfig::get_http_api_enabled(SrsConfDirective* conf)
{
if (!conf) {
return false;
}

3
trunk/src/app/srs_app_config.hpp
Unescape Escape View File

@ -124,6 +124,8 @@ public:
virtual void unsubscribe(ISrsReloadHandler* handler);
virtual int reload();
private:
virtual int reload_http_api(SrsConfDirective* old_root);
virtual int reload_vhost(SrsConfDirective* old_root);
virtual int reload_transcode(SrsConfDirective* new_vhost, SrsConfDirective* old_vhost);
virtual int reload_ingest(SrsConfDirective* new_vhost, SrsConfDirective* old_vhost);
// parse options and file
@ -222,6 +224,7 @@ private:
virtual SrsConfDirective* get_http_api();
public:
virtual bool get_http_api_enabled();
virtual bool get_http_api_enabled(SrsConfDirective* conf);
virtual int get_http_api_listen();
// http stream section
private:

10
trunk/src/app/srs_app_reload.cpp
Unescape Escape View File

@ -65,6 +65,16 @@ int ISrsReloadHandler::on_reload_pithy_print()
return ERROR_SUCCESS;
}
int ISrsReloadHandler::on_reload_http_api_enabled()
{
return ERROR_SUCCESS;
}
int ISrsReloadHandler::on_reload_http_api_disabled()
{
return ERROR_SUCCESS;
}
int ISrsReloadHandler::on_reload_vhost_added(string /*vhost*/)
{
return ERROR_SUCCESS;

2
trunk/src/app/srs_app_reload.hpp
Unescape Escape View File

@ -47,6 +47,8 @@ public:
virtual int on_reload_log_level();
virtual int on_reload_log_file();
virtual int on_reload_pithy_print();
virtual int on_reload_http_api_enabled();
virtual int on_reload_http_api_disabled();
virtual int on_reload_vhost_added(std::string vhost);
virtual int on_reload_vhost_removed(std::string vhost);
virtual int on_reload_atc(std::string vhost);

14
trunk/src/app/srs_app_server.cpp
Unescape Escape View File

@ -617,3 +617,17 @@ int SrsServer::on_reload_pid()
return acquire_pid_file();
}
int SrsServer::on_reload_http_api_enabled()
{
return listen_http_api();
}
int SrsServer::on_reload_http_api_disabled()
{
int ret = ERROR_SUCCESS;
close_listeners(SrsListenerHttpApi);
return ret;
}

2
trunk/src/app/srs_app_server.hpp
Unescape Escape View File

@ -116,6 +116,8 @@ private:
public:
virtual int on_reload_listen();
virtual int on_reload_pid();
virtual int on_reload_http_api_enabled();
virtual int on_reload_http_api_disabled();
};
#endif
Write Preview
Loading…
Cancel
Save