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-07-10 11:50:35 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
0aa053433c37dc3c96e0869017fe564cf6df7455
0aa05343
1 parent
2567a895
fix #132: build failed when enable the info or verbose log.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
7 行增加
和
9 行删除
trunk/src/app/srs_app_heartbeat.cpp
trunk/src/app/srs_app_http_client.cpp
trunk/src/app/srs_app_http_stream.cpp
trunk/src/app/srs_app_heartbeat.cpp
查看文件 @
0aa0534
...
...
@@ -84,9 +84,8 @@ void SrsHttpHeartbeat::heartbeat()
ISrsHttpMessage
*
msg
=
NULL
;
if
((
ret
=
http
.
post
(
uri
.
get_path
(),
req
,
&
msg
))
!=
ERROR_SUCCESS
)
{
srs_info
(
"http post hartbeart uri failed. "
"url=%s, request=%s, response=%s, ret=%d"
,
url
.
c_str
(),
req
.
c_str
(),
res
.
c_str
(),
ret
);
srs_info
(
"http post hartbeart uri failed. url=%s, request=%s, ret=%d"
,
url
.
c_str
(),
req
.
c_str
(),
ret
);
return
;
}
SrsAutoFree
(
ISrsHttpMessage
,
msg
);
...
...
@@ -96,9 +95,8 @@ void SrsHttpHeartbeat::heartbeat()
return
;
}
srs_info
(
"http hook hartbeart success. "
"url=%s, request=%s, status_code=%d, response=%s, ret=%d"
,
url
.
c_str
(),
req
.
c_str
(),
status_code
,
res
.
c_str
(),
ret
);
srs_info
(
"http hook hartbeart success. url=%s, request=%s, response=%s, ret=%d"
,
url
.
c_str
(),
req
.
c_str
(),
res
.
c_str
(),
ret
);
return
;
}
...
...
trunk/src/app/srs_app_http_client.cpp
查看文件 @
0aa0534
...
...
@@ -187,7 +187,7 @@ int SrsHttpClient::connect()
host
.
c_str
(),
port
,
timeout_us
,
ret
);
return
ret
;
}
srs_info
(
"connect to server success. server=%s, port=%d"
,
host
,
port
);
srs_info
(
"connect to server success. server=%s, port=%d"
,
host
.
c_str
()
,
port
);
srs_assert
(
!
skt
);
skt
=
new
SrsStSocket
(
stfd
);
...
...
trunk/src/app/srs_app_http_stream.cpp
查看文件 @
0aa0534
...
...
@@ -134,7 +134,7 @@ int SrsStreamCache::cycle()
}
if
(
count
<=
0
)
{
srs_info
(
"http:
mw sleep %dms for no msg"
,
mw_sleep
);
srs_info
(
"http:
sleep %dms for no msg"
,
SRS_CONSTS_RTMP_PULSE_TIMEOUT_US
);
// directly use sleep, donot use consumer wait.
st_usleep
(
SRS_CONSTS_RTMP_PULSE_TIMEOUT_US
);
...
...
@@ -522,7 +522,7 @@ int SrsLiveStream::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
}
if
(
count
<=
0
)
{
srs_info
(
"http:
mw sleep %dms for no msg"
,
mw_sleep
);
srs_info
(
"http:
sleep %dms for no msg"
,
SRS_CONSTS_RTMP_PULSE_TIMEOUT_US
);
// directly use sleep, donot use consumer wait.
st_usleep
(
SRS_CONSTS_RTMP_PULSE_TIMEOUT_US
);
...
...
请
注册
或
登录
后发表评论