winlin

rename from get_ingest to get_ingest_by_id of config

@@ -624,6 +624,10 @@ int SrsConfig::reload() @@ -624,6 +624,10 @@ int SrsConfig::reload()
624 } 624 }
625 srs_trace("vhost %s reload transcode success.", vhost.c_str()); 625 srs_trace("vhost %s reload transcode success.", vhost.c_str());
626 } 626 }
  627 + // transcode, many per vhost.
  628 + /*if ((ret = reload_transcode(new_vhost, old_vhost)) != ERROR_SUCCESS) {
  629 + return ret;
  630 + }*/
627 // ingest, many per vhost. 631 // ingest, many per vhost.
628 if ((ret = reload_ingest(new_vhost, old_vhost)) != ERROR_SUCCESS) { 632 if ((ret = reload_ingest(new_vhost, old_vhost)) != ERROR_SUCCESS) {
629 return ret; 633 return ret;
@@ -1768,7 +1772,7 @@ void SrsConfig::get_ingesters(std::string vhost, std::vector<SrsConfDirective*>& @@ -1768,7 +1772,7 @@ void SrsConfig::get_ingesters(std::string vhost, std::vector<SrsConfDirective*>&
1768 return; 1772 return;
1769 } 1773 }
1770 1774
1771 -SrsConfDirective* SrsConfig::get_ingest(std::string vhost, std::string ingest_id) 1775 +SrsConfDirective* SrsConfig::get_ingest_by_id(std::string vhost, std::string ingest_id)
1772 { 1776 {
1773 SrsConfDirective* conf = get_vhost(vhost); 1777 SrsConfDirective* conf = get_vhost(vhost);
1774 if (!conf) { 1778 if (!conf) {
@@ -194,7 +194,7 @@ public: @@ -194,7 +194,7 @@ public:
194 // ingest section 194 // ingest section
195 public: 195 public:
196 virtual void get_ingesters(std::string vhost, std::vector<SrsConfDirective*>& ingeters); 196 virtual void get_ingesters(std::string vhost, std::vector<SrsConfDirective*>& ingeters);
197 - virtual SrsConfDirective* get_ingest(std::string vhost, std::string ingest_id); 197 + virtual SrsConfDirective* get_ingest_by_id(std::string vhost, std::string ingest_id);
198 virtual bool get_ingest_enabled(SrsConfDirective* ingest); 198 virtual bool get_ingest_enabled(SrsConfDirective* ingest);
199 virtual std::string get_ingest_ffmpeg(SrsConfDirective* ingest); 199 virtual std::string get_ingest_ffmpeg(SrsConfDirective* ingest);
200 virtual std::string get_ingest_input_type(SrsConfDirective* ingest); 200 virtual std::string get_ingest_input_type(SrsConfDirective* ingest);
@@ -429,7 +429,7 @@ int SrsIngester::on_reload_ingest_added(string vhost, string ingest_id) @@ -429,7 +429,7 @@ int SrsIngester::on_reload_ingest_added(string vhost, string ingest_id)
429 int ret = ERROR_SUCCESS; 429 int ret = ERROR_SUCCESS;
430 430
431 SrsConfDirective* _vhost = _srs_config->get_vhost(vhost); 431 SrsConfDirective* _vhost = _srs_config->get_vhost(vhost);
432 - SrsConfDirective* _ingester = _srs_config->get_ingest(vhost, ingest_id); 432 + SrsConfDirective* _ingester = _srs_config->get_ingest_by_id(vhost, ingest_id);
433 433
434 if ((ret = parse_engines(_vhost, _ingester)) != ERROR_SUCCESS) { 434 if ((ret = parse_engines(_vhost, _ingester)) != ERROR_SUCCESS) {
435 return ret; 435 return ret;