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

Fixed debug levels for MistIn processes. Tweaked various verbosity levels.

Browse source
This commit is contained in:
Thulinma 2014-08-05 15:15:20 +02:00
parent 7d015a32d3
commit 68245bf74c
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/shared_memory.cpp
View file

@ -102,7 +102,7 @@ namespace IPC {
} }
#endif #endif
if (!(*this)){ if (!(*this)){
FAIL_MSG("Failed to open semaphore %s: %s", name, strerror(errno)); DEBUG_MSG(DLVL_VERYHIGH, "Attempt to open semaphore %s: %s", name, strerror(errno));
} }
myName = (char *)name; myName = (char *)name;
} }
@ -648,7 +648,7 @@ namespace IPC {
sharedPage tmp(std::string(baseName + (char)(myPages.size() + (int)'A')), (4096 << myPages.size()), true); sharedPage tmp(std::string(baseName + (char)(myPages.size() + (int)'A')), (4096 << myPages.size()), true);
myPages.insert(tmp); myPages.insert(tmp);
tmp.master = false; tmp.master = false;
DEBUG_MSG(DLVL_MEDIUM, "Added a new page: %s", tmp.name.c_str()); DEBUG_MSG(DLVL_VERYHIGH, "Created a new page: %s", tmp.name.c_str());
} }
///\brief Deletes the highest allocated page ///\brief Deletes the highest allocated page

32
lib/stream.cpp
View file

@ -63,17 +63,23 @@ void Util::Stream::sanitizeName(std::string & streamname) {
bool Util::Stream::getLive(std::string streamname) { bool Util::Stream::getLive(std::string streamname) {
JSON::Value ServConf = JSON::fromFile(getTmpFolder() + "streamlist"); JSON::Value ServConf = JSON::fromFile(getTmpFolder() + "streamlist");
std::stringstream name; std::string bufferTime;
std::string debugLvl;
std::string player_bin = Util::getMyPath() + "MistInBuffer"; std::string player_bin = Util::getMyPath() + "MistInBuffer";
DEBUG_MSG(DLVL_WARN, "Starting %s -p -s %s", player_bin.c_str(), streamname.c_str()); DEBUG_MSG(DLVL_WARN, "Starting %s -p -s %s", player_bin.c_str(), streamname.c_str());
char * argv[15] = {(char *)player_bin.c_str(), (char *)"-p", (char *)"-s", (char *)streamname.c_str(), (char *)0}; char * argv[15] = {(char *)player_bin.c_str(), (char *)"-p", (char *)"-s", (char *)streamname.c_str()};
int argNum = 4; int argNum = 3;
if (ServConf["streams"][streamname].isMember("DVR")) { if (ServConf["streams"][streamname].isMember("DVR")) {
std::string bufferTime = ServConf["streams"][streamname]["DVR"].asString(); bufferTime = ServConf["streams"][streamname]["DVR"].asString();
argv[argNum++] = (char *)"-b"; argv[++argNum] = (char *)"-b";
argv[argNum++] = (char *)bufferTime.c_str(); argv[++argNum] = (char *)bufferTime.c_str();
argv[argNum++] = (char *)0;
} }
if (Util::Config::printDebugLevel != DEBUG){
debugLvl = JSON::Value((long long)Util::Config::printDebugLevel).asString();
argv[++argNum] = (char *)"--debug";
argv[++argNum] = (char *)debugLvl.c_str();
}
argv[++argNum] = (char *)0;
int pid = fork(); int pid = fork();
if (pid == -1) { if (pid == -1) {
@ -101,8 +107,16 @@ bool Util::Stream::getVod(std::string filename, std::string streamname) {
selected = true; selected = true;
} }
INFO_MSG("Starting %s -p -s %s %s", player_bin.c_str(), streamname.c_str(), filename.c_str()); INFO_MSG("Starting %s -p -s %s %s", player_bin.c_str(), streamname.c_str(), filename.c_str());
char * const argv[] = {(char *)player_bin.c_str(), (char *)"-p", (char *)"-s", (char *)streamname.c_str(), (char *)filename.c_str(), (char *)0}; char * argv[15] = {(char *)player_bin.c_str(), (char *)"-p", (char *)"-s", (char *)streamname.c_str(), (char *)filename.c_str()};
int argNum = 4;
std::string debugLvl;
if (Util::Config::printDebugLevel != DEBUG){
debugLvl = JSON::Value((long long)Util::Config::printDebugLevel).asString();
argv[++argNum] = (char *)"--debug";
argv[++argNum] = (char *)debugLvl.c_str();
}
argv[++argNum] = (char *)0;
int pid = fork(); int pid = fork();
if (pid == -1) { if (pid == -1) {
FAIL_MSG("Forking process for stream %s failed: %s", streamname.c_str(), strerror(errno)); FAIL_MSG("Forking process for stream %s failed: %s", streamname.c_str(), strerror(errno));