mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Change id from int to string for the statistics. 3.0.157
This commit is contained in:
parent
010878889c
commit
fb7c051833
14 changed files with 108 additions and 95 deletions
|
@ -2158,8 +2158,11 @@ srs_error_t SrsConfig::global_to_json(SrsJsonObject* obj)
|
|||
SrsJsonObject* sobj = SrsJsonAny::object();
|
||||
sobjs->set(dir->arg0(), sobj);
|
||||
|
||||
SrsStatisticVhost* svhost = stat->find_vhost(dir->arg0());
|
||||
sobj->set("id", SrsJsonAny::integer(svhost? (double)svhost->id : 0));
|
||||
SrsStatisticVhost* svhost = stat->find_vhost_by_name(dir->arg0());
|
||||
if (!svhost) {
|
||||
continue;
|
||||
}
|
||||
sobj->set("id", SrsJsonAny::str(svhost->id.c_str()));
|
||||
sobj->set("name", dir->dumps_arg0_to_str());
|
||||
sobj->set("enabled", SrsJsonAny::boolean(get_vhost_enabled(dir->arg0())));
|
||||
|
||||
|
@ -2283,8 +2286,11 @@ srs_error_t SrsConfig::vhost_to_json(SrsConfDirective* vhost, SrsJsonObject* obj
|
|||
// always present in vhost.
|
||||
SrsStatistic* stat = SrsStatistic::instance();
|
||||
|
||||
SrsStatisticVhost* svhost = stat->find_vhost(vhost->arg0());
|
||||
obj->set("id", SrsJsonAny::integer(svhost? (double)svhost->id : 0));
|
||||
SrsStatisticVhost* svhost = stat->find_vhost_by_name(vhost->arg0());
|
||||
if (!svhost) {
|
||||
return err;
|
||||
}
|
||||
obj->set("id", SrsJsonAny::str(svhost->id.c_str()));
|
||||
|
||||
obj->set("name", vhost->dumps_arg0_to_str());
|
||||
obj->set("enabled", SrsJsonAny::boolean(get_vhost_enabled(vhost)));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue