hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added pid/timeout/kill functionality to stats

Browse source 
# Conflicts:
#	src/output/output_rtmp.cpp
This commit is contained in:
Thulinma 2015-03-03 11:33:52 +01:00
parent c17ba4e383
commit 35ddc79c1a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/input/input.cpp
View file

@ -146,7 +146,7 @@ namespace Mist {
//after this player functionality //after this player functionality
metaPage.init(config->getString("streamname"), (isBuffer ? DEFAULT_META_PAGE_SIZE : myMeta.getSendLen()), true); metaPage.init(config->getString("streamname"), (isBuffer ? DEFAULT_META_PAGE_SIZE : myMeta.getSendLen()), true);
myMeta.writeTo(metaPage.mapped); myMeta.writeTo(metaPage.mapped);
userPage.init(config->getString("streamname") + "_users", 30, true); userPage.init(config->getString("streamname") + "_users", PLAY_EX_SIZE, true);
if (!isBuffer){ if (!isBuffer){

4
src/output/output.cpp
View file

@ -247,7 +247,7 @@ namespace Mist {
return; return;
} }
statsPage = IPC::sharedClient("statistics", STAT_EX_SIZE, true); statsPage = IPC::sharedClient("statistics", STAT_EX_SIZE, true);
playerConn = IPC::sharedClient(streamName + "_users", 30, true); playerConn = IPC::sharedClient(streamName + "_users", PLAY_EX_SIZE , true);
updateMeta(); updateMeta();
selectDefaultTracks(); selectDefaultTracks();
sought = false; sought = false;
@ -729,7 +729,7 @@ namespace Mist {
} }
int tNum = 0; int tNum = 0;
if (!playerConn.getData()){ if (!playerConn.getData()){
playerConn = IPC::sharedClient(streamName + "_users", 30, true); playerConn = IPC::sharedClient(streamName + "_users", PLAY_EX_SIZE, true);
if (!playerConn.getData()){ if (!playerConn.getData()){
DEBUG_MSG(DLVL_WARN, "Player connection failure - aborting output"); DEBUG_MSG(DLVL_WARN, "Player connection failure - aborting output");
myConn.close(); myConn.close();