external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

fix reload ingest bug, remove when disabled. 0.9.196

Browse source
This commit is contained in:
winlin 2014-08-16 19:59:14 +08:00
parent 2f5fa25f29
commit cf7504826b
10 changed files with 1116 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/app/srs_app_config.hpp
View file

@ -290,6 +290,12 @@ public:
* @remark, user can test the config before reload it.
*/
virtual int reload();
protected:
/**
* reload from the config.
* @remark, use protected for the utest to override with mock.
*/
virtual int reload_conf(SrsConfig* conf);
private:
/**
* reload the http_api section of config.
@ -334,7 +340,7 @@ protected:
/**
* parse config from the buffer.
* @param buffer, the config buffer, user must delete it.
* @remark, protected for the utest to override with mock.
* @remark, use protected for the utest to override with mock.
*/
virtual int parse_buffer(_srs_internal::SrsConfigBuffer* buffer);
private: