mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
for #319, support HTTP RAW API config_query global data.
This commit is contained in:
winlin
parent
d921d59e57
commit
8e635d9749
5 changed files with 444 additions and 2 deletions
|
|
@ -47,6 +47,7 @@ using namespace std;
|
|||
#include <srs_app_utility.hpp>
|
||||
#include <srs_core_performance.hpp>
|
||||
#include <srs_kernel_file.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
|
||||
using namespace _srs_internal;
|
||||
|
||||
|
|
@ -332,6 +333,31 @@ int SrsConfDirective::persistence(SrsFileWriter* writer, int level)
|
|||
return ret;
|
||||
}
|
||||
|
||||
SrsAmf0StrictArray* SrsConfDirective::dumps_args()
|
||||
{
|
||||
SrsAmf0StrictArray* arr = SrsAmf0Any::strict_array();
|
||||
for (int i = 0; i < (int)args.size(); i++) {
|
||||
string arg = args.at(i);
|
||||
arr->append(SrsAmf0Any::str(arg.c_str()));
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
|
||||
SrsAmf0Any* SrsConfDirective::dumps_arg0_to_str()
|
||||
{
|
||||
return SrsAmf0Any::str(arg0().c_str());
|
||||
}
|
||||
|
||||
SrsAmf0Any* SrsConfDirective::dumps_arg0_to_number()
|
||||
{
|
||||
return SrsAmf0Any::number(::atof(arg0().c_str()));
|
||||
}
|
||||
|
||||
SrsAmf0Any* SrsConfDirective::dumps_arg0_to_boolean()
|
||||
{
|
||||
return SrsAmf0Any::boolean(arg0() == "on");
|
||||
}
|
||||
|
||||
// see: ngx_conf_parse
|
||||
int SrsConfDirective::parse_conf(SrsConfigBuffer* buffer, SrsDirectiveType type)
|
||||
{
|
||||
|
|
@ -1547,6 +1573,208 @@ int SrsConfig::persistence()
|
|||
return ret;
|
||||
}
|
||||
|
||||
int SrsConfig::global_to_json(SrsAmf0Object* obj)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
for (int i = 0; i < (int)root->directives.size(); i++) {
|
||||
SrsConfDirective* dir = root->directives.at(i);
|
||||
if (dir->is_vhost()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (dir->name == "listen") {
|
||||
obj->set(dir->name, dir->dumps_args());
|
||||
} else if (dir->name == "pid") {
|
||||
obj->set(dir->name, dir->dumps_arg0_to_str());
|
||||
} else if (dir->name == "chunk_size") {
|
||||
obj->set(dir->name, dir->dumps_arg0_to_number());
|
||||
} else if (dir->name == "ff_log_dir") {
|
||||
obj->set(dir->name, dir->dumps_arg0_to_str());
|
||||
} else if (dir->name == "srs_log_tank") {
|
||||
obj->set(dir->name, dir->dumps_arg0_to_str());
|
||||
} else if (dir->name == "srs_log_level") {
|
||||
obj->set(dir->name, dir->dumps_arg0_to_str());
|
||||
} else if (dir->name == "srs_log_file") {
|
||||
obj->set(dir->name, dir->dumps_arg0_to_str());
|
||||
} else if (dir->name == "max_connections") {
|
||||
obj->set(dir->name, dir->dumps_arg0_to_number());
|
||||
} else if (dir->name == "daemon") {
|
||||
obj->set(dir->name, dir->dumps_arg0_to_boolean());
|
||||
} else if (dir->name == "utc_time") {
|
||||
obj->set(dir->name, dir->dumps_arg0_to_boolean());
|
||||
} else if (dir->name == "pithy_print_ms") {
|
||||
obj->set(dir->name, dir->dumps_arg0_to_number());
|
||||
} else if (dir->name == "heartbeat") {
|
||||
SrsAmf0Object* sobj = SrsAmf0Any::object();
|
||||
for (int j = 0; j < (int)dir->directives.size(); j++) {
|
||||
SrsConfDirective* sdir = dir->directives.at(j);
|
||||
if (sdir->name == "enabled") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_boolean());
|
||||
} else if (sdir->name == "interval") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_number());
|
||||
} else if (sdir->name == "url") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_str());
|
||||
} else if (sdir->name == "device_id") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_str());
|
||||
} else if (sdir->name == "summaries") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_boolean());
|
||||
}
|
||||
}
|
||||
obj->set(dir->name, sobj);
|
||||
} else if (dir->name == "stats") {
|
||||
SrsAmf0Object* sobj = SrsAmf0Any::object();
|
||||
for (int j = 0; j < (int)dir->directives.size(); j++) {
|
||||
SrsConfDirective* sdir = dir->directives.at(j);
|
||||
if (sdir->name == "network") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_number());
|
||||
} else if (sdir->name == "disk") {
|
||||
sobj->set(sdir->name, sdir->dumps_args());
|
||||
}
|
||||
}
|
||||
obj->set(dir->name, sobj);
|
||||
} else if (dir->name == "http_api") {
|
||||
SrsAmf0Object* sobj = SrsAmf0Any::object();
|
||||
for (int j = 0; j < (int)dir->directives.size(); j++) {
|
||||
SrsConfDirective* sdir = dir->directives.at(j);
|
||||
if (sdir->name == "enabled") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_boolean());
|
||||
} else if (sdir->name == "listen") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_str());
|
||||
} else if (sdir->name == "crossdomain") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_boolean());
|
||||
} else if (sdir->name == "raw_api") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_boolean());
|
||||
}
|
||||
}
|
||||
obj->set(dir->name, sobj);
|
||||
} else if (dir->name == "http_server") {
|
||||
SrsAmf0Object* sobj = SrsAmf0Any::object();
|
||||
for (int j = 0; j < (int)dir->directives.size(); j++) {
|
||||
SrsConfDirective* sdir = dir->directives.at(j);
|
||||
if (sdir->name == "enabled") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_boolean());
|
||||
} else if (sdir->name == "listen") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_str());
|
||||
} else if (sdir->name == "dir") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_str());
|
||||
}
|
||||
}
|
||||
obj->set(dir->name, sobj);
|
||||
} else if (dir->name == "stream_caster") {
|
||||
SrsAmf0Object* sobj = SrsAmf0Any::object();
|
||||
for (int j = 0; j < (int)dir->directives.size(); j++) {
|
||||
SrsConfDirective* sdir = dir->directives.at(j);
|
||||
if (sdir->name == "enabled") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_boolean());
|
||||
} else if (sdir->name == "caster") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_str());
|
||||
} else if (sdir->name == "output") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_str());
|
||||
} else if (sdir->name == "listen") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_str());
|
||||
} else if (sdir->name == "rtp_port_min") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_number());
|
||||
} else if (sdir->name == "rtp_port_max") {
|
||||
sobj->set(sdir->name, sdir->dumps_arg0_to_number());
|
||||
}
|
||||
}
|
||||
obj->set(dir->name, sobj);
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
SrsAmf0Object* sobjs = SrsAmf0Any::object();
|
||||
int nb_vhosts = 0;
|
||||
|
||||
for (int i = 0; i < (int)root->directives.size(); i++) {
|
||||
SrsConfDirective* dir = root->directives.at(i);
|
||||
if (!dir->is_vhost()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
nb_vhosts++;
|
||||
SrsAmf0Object* sobj = SrsAmf0Any::object();
|
||||
sobjs->set(dir->arg0(), sobj);
|
||||
|
||||
sobj->set("enabled", SrsAmf0Any::boolean(get_vhost_enabled(dir->name)));
|
||||
sobj->set("dvr", SrsAmf0Any::boolean(get_dvr_enabled(dir->name)));
|
||||
sobj->set("http_static", SrsAmf0Any::boolean(get_vhost_http_enabled(dir->name)));
|
||||
sobj->set("http_remux", SrsAmf0Any::boolean(get_vhost_http_remux_enabled(dir->name)));
|
||||
sobj->set("hls", SrsAmf0Any::boolean(get_hls_enabled(dir->name)));
|
||||
sobj->set("hds", SrsAmf0Any::boolean(get_hds_enabled(dir->name)));
|
||||
sobj->set("http_hooks", SrsAmf0Any::boolean(get_vhost_http_hooks(dir->name)));
|
||||
sobj->set("exec", SrsAmf0Any::boolean(get_exec_enabled(dir->name)));
|
||||
sobj->set("bandcheck", SrsAmf0Any::boolean(get_bw_check_enabled(dir->name)));
|
||||
sobj->set("origin", SrsAmf0Any::boolean(!get_vhost_is_edge(dir->name)));
|
||||
sobj->set("forward", SrsAmf0Any::boolean(get_forward(dir->name)));
|
||||
|
||||
sobj->set("security", SrsAmf0Any::boolean(get_security_enabled(dir->name)));
|
||||
sobj->set("refer", SrsAmf0Any::boolean(get_refer(dir->name) || get_refer_play(dir->name) || get_refer_publish(dir->name)));
|
||||
|
||||
sobj->set("mr", SrsAmf0Any::boolean(get_mr_enabled(dir->name)));
|
||||
sobj->set("min_latency", SrsAmf0Any::boolean(get_realtime_enabled(dir->name)));
|
||||
sobj->set("gop_cache", SrsAmf0Any::boolean(get_gop_cache(dir->name)));
|
||||
sobj->set("tcp_nodelay", SrsAmf0Any::boolean(get_tcp_nodelay(dir->name)));
|
||||
|
||||
sobj->set("mix_correct", SrsAmf0Any::boolean(get_mix_correct(dir->name)));
|
||||
sobj->set("time_jitter", SrsAmf0Any::boolean(get_time_jitter(dir->name) != SrsRtmpJitterAlgorithmOFF));
|
||||
sobj->set("atc", SrsAmf0Any::boolean(get_atc(dir->name)));
|
||||
|
||||
bool has_transcode = false;
|
||||
for (int j = 0; !has_transcode && j < (int)dir->directives.size(); j++) {
|
||||
SrsConfDirective* sdir = dir->directives.at(j);
|
||||
if (sdir->name != "transcode") {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!get_transcode_enabled(sdir)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
for (int k = 0; !has_transcode && k < (int)sdir->directives.size(); k++) {
|
||||
SrsConfDirective* ssdir = sdir->directives.at(k);
|
||||
if (ssdir->name != "engine") {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (get_engine_enabled(ssdir)) {
|
||||
has_transcode = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
sobj->set("transcode", SrsAmf0Any::boolean(has_transcode));
|
||||
|
||||
bool has_ingest = false;
|
||||
for (int j = 0; !has_ingest && j < (int)dir->directives.size(); j++) {
|
||||
SrsConfDirective* sdir = dir->directives.at(j);
|
||||
if (sdir->name != "ingest") {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (get_ingest_enabled(sdir)) {
|
||||
has_ingest = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
sobj->set("ingest", SrsAmf0Any::boolean(has_ingest));
|
||||
}
|
||||
|
||||
obj->set("nb_vhosts", SrsAmf0Any::number(nb_vhosts));
|
||||
obj->set("vhosts", sobjs);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int SrsConfig::vhost_to_json(SrsConfDirective* vhost, SrsAmf0Object* obj)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
string SrsConfig::config()
|
||||
{
|
||||
return config_file;
|
||||
|
|
|
|||
|
|
@ -31,10 +31,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
|
||||
#include <srs_app_reload.hpp>
|
||||
|
||||
class SrsFileWriter;
|
||||
class SrsAmf0Object;
|
||||
class SrsAmf0StrictArray;
|
||||
class SrsAmf0Any;
|
||||
|
||||
namespace _srs_internal
|
||||
{
|
||||
|
|
@ -143,6 +147,16 @@ public:
|
|||
* @param level, the root is level0, all its directives are level1, and so on.
|
||||
*/
|
||||
virtual int persistence(SrsFileWriter* writer, int level);
|
||||
/**
|
||||
* dumps the args[0-N] to array(string).
|
||||
*/
|
||||
virtual SrsAmf0StrictArray* dumps_args();
|
||||
/**
|
||||
* dumps arg0 to str, number or boolean.
|
||||
*/
|
||||
virtual SrsAmf0Any* dumps_arg0_to_str();
|
||||
virtual SrsAmf0Any* dumps_arg0_to_number();
|
||||
virtual SrsAmf0Any* dumps_arg0_to_boolean();
|
||||
// private parse.
|
||||
private:
|
||||
/**
|
||||
|
|
@ -298,6 +312,14 @@ public:
|
|||
* persistence current config to file.
|
||||
*/
|
||||
virtual int persistence();
|
||||
/**
|
||||
* dumps the global sections to json.
|
||||
*/
|
||||
virtual int global_to_json(SrsAmf0Object* obj);
|
||||
/**
|
||||
* dumps the vhost section to json.
|
||||
*/
|
||||
virtual int vhost_to_json(SrsConfDirective* vhost, SrsAmf0Object* obj);
|
||||
/**
|
||||
* get the config file path.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ using namespace std;
|
|||
#include <srs_app_http_conn.hpp>
|
||||
#include <srs_kernel_consts.hpp>
|
||||
#include <srs_app_server.hpp>
|
||||
#include <srs_rtmp_amf0.hpp>
|
||||
|
||||
int srs_api_response_jsonp(ISrsHttpResponseWriter* w, string callback, string data)
|
||||
{
|
||||
|
|
@ -872,6 +873,63 @@ int SrsGoApiRaw::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
|
|||
return srs_api_response_code(w, r, ret);
|
||||
}
|
||||
|
||||
// for rpc=config_query, to get the configs of server.
|
||||
// @param scope the scope to query for config, it can be:
|
||||
// global, the configs belongs to the root, donot includes any sub directives.
|
||||
// vhost, the configs for specified vhost by @param vhost.
|
||||
// @param vhost the vhost name for @param scope is vhost to query config.
|
||||
// for the default vhost, must be __defaultVhost__
|
||||
if (rpc == "config_query") {
|
||||
std::string scope = r->query_get("scope");
|
||||
std::string vhost = r->query_get("vhost");
|
||||
if (scope.empty() || (scope != "global" && scope != "vhost")) {
|
||||
ret = ERROR_SYSTEM_CONFIG_RAW_PARAMS;
|
||||
srs_error("raw api config_query invalid scope=%s. ret=%d", scope.c_str(), ret);
|
||||
return srs_api_response_code(w, r, ret);
|
||||
}
|
||||
|
||||
// config query.
|
||||
SrsAmf0Object* obj = SrsAmf0Any::object();
|
||||
SrsAutoFree(SrsAmf0Object, obj);
|
||||
|
||||
obj->set("code", SrsAmf0Any::number(ERROR_SUCCESS));
|
||||
|
||||
if (scope == "vhost") {
|
||||
// query vhost scope.
|
||||
if (vhost.empty()) {
|
||||
ret = ERROR_SYSTEM_CONFIG_RAW_PARAMS;
|
||||
srs_error("raw api config_query vhost invalid vhost=%s. ret=%d", vhost.c_str(), ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
SrsConfDirective* root = _srs_config->get_root();
|
||||
SrsConfDirective* conf = root->get("vhost", vhost);
|
||||
if (!conf) {
|
||||
ret = ERROR_SYSTEM_CONFIG_RAW_PARAMS;
|
||||
srs_error("raw api config_query vhost invalid vhost=%s. ret=%d", vhost.c_str(), ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
SrsAmf0Object* data = SrsAmf0Any::object();
|
||||
obj->set("vhost", data);
|
||||
if ((ret = _srs_config->vhost_to_json(conf, data)) != ERROR_SUCCESS) {
|
||||
srs_error("raw api config_query vhost failed. ret=%d", ret);
|
||||
return srs_api_response_code(w, r, ret);
|
||||
}
|
||||
} else {
|
||||
SrsAmf0Object* data = SrsAmf0Any::object();
|
||||
obj->set("global", data);
|
||||
|
||||
// query global scope.
|
||||
if ((ret = _srs_config->global_to_json(data)) != ERROR_SUCCESS) {
|
||||
srs_error("raw api config_query global failed. ret=%d", ret);
|
||||
return srs_api_response_code(w, r, ret);
|
||||
}
|
||||
}
|
||||
|
||||
return srs_api_response(w, r, obj->to_json());
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue