Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-01-18 17:17:07 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
c4302b9b619387c0147da4a564a84edcf57e907b
c4302b9b
1 parent
f1393ee4
for bug #277, the http server subscribe the reload.
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
12 行增加
和
18 行删除
trunk/src/app/srs_app_http_conn.cpp
trunk/src/app/srs_app_http_conn.hpp
trunk/src/app/srs_app_server.cpp
trunk/src/app/srs_app_server.hpp
trunk/src/app/srs_app_http_conn.cpp
查看文件 @
c4302b9
...
...
@@ -199,6 +199,13 @@ int SrsHttpServer::initialize()
return
ret
;
}
int
SrsHttpServer
::
on_reload_vhost_http_updated
()
{
int
ret
=
ERROR_SUCCESS
;
// TODO: FIXME: implements it.
return
ret
;
}
SrsHttpConn
::
SrsHttpConn
(
SrsServer
*
svr
,
st_netfd_t
fd
,
SrsHttpServer
*
m
)
:
SrsConnection
(
svr
,
fd
)
{
...
...
trunk/src/app/srs_app_http_conn.hpp
查看文件 @
c4302b9
...
...
@@ -35,6 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_st.hpp>
#include <srs_app_conn.hpp>
#include <srs_app_http.hpp>
#include <srs_app_reload.hpp>
class
SrsStSocket
;
class
SrsHttpParser
;
...
...
@@ -56,7 +57,7 @@ protected:
virtual
int
serve_flv_stream
(
ISrsGoHttpResponseWriter
*
w
,
SrsHttpMessage
*
r
,
std
::
string
fullpath
,
int
offset
);
};
class
SrsHttpServer
class
SrsHttpServer
:
public
ISrsReloadHandler
{
public
:
SrsGoHttpServeMux
mux
;
...
...
@@ -65,6 +66,9 @@ public:
virtual
~
SrsHttpServer
();
public
:
virtual
int
initialize
();
// interface ISrsThreadHandler.
public:
virtual
int
on_reload_vhost_http_updated
();
};
class
SrsHttpConn
:
public
SrsConnection
...
...
trunk/src/app/srs_app_server.cpp
查看文件 @
c4302b9
...
...
@@ -1013,22 +1013,6 @@ int SrsServer::on_reload_vhost_removed(std::string /*vhost*/)
return
ret
;
}
int
SrsServer
::
on_reload_vhost_http_updated
()
{
int
ret
=
ERROR_SUCCESS
;
#ifdef SRS_AUTO_HTTP_SERVER
srs_freep
(
http_stream_mux
);
http_stream_mux
=
new
SrsHttpServer
();
if
((
ret
=
http_stream_mux
->
initialize
())
!=
ERROR_SUCCESS
)
{
return
ret
;
}
#endif
return
ret
;
}
int
SrsServer
::
on_reload_http_api_enabled
()
{
int
ret
=
ERROR_SUCCESS
;
...
...
trunk/src/app/srs_app_server.hpp
查看文件 @
c4302b9
...
...
@@ -236,7 +236,6 @@ public:
virtual
int
on_reload_pid
();
virtual
int
on_reload_vhost_added
(
std
::
string
vhost
);
virtual
int
on_reload_vhost_removed
(
std
::
string
vhost
);
virtual
int
on_reload_vhost_http_updated
();
virtual
int
on_reload_http_api_enabled
();
virtual
int
on_reload_http_api_disabled
();
virtual
int
on_reload_http_stream_enabled
();
...
...
请
注册
或
登录
后发表评论