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

Fixed all ::Start* paths to no longer require binaries to be in the $PATH to work.

Browse source
This commit is contained in:
Thulinma 2012-10-23 11:26:53 +02:00
parent 0ffce1084a
commit c1ba9c618b
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/conn_http.cpp
View file

@ -402,8 +402,8 @@ int main(int argc, char ** argv){
conf.activate(); conf.activate();
//start progressive and dynamic handlers from the same folder as this application //start progressive and dynamic handlers from the same folder as this application
Util::Procs::Start("progressive", (std::string)(argv[0]) + "Progressive -n"); Util::Procs::Start("progressive", Util::getMyPath() + "MistConnHTTPProgressive -n");
Util::Procs::Start("dynamic", (std::string)(argv[0]) + "Dynamic -n"); Util::Procs::Start("dynamic", Util::getMyPath() + "MistConnHTTPDynamic -n");
while (server_socket.connected() && conf.is_active){ while (server_socket.connected() && conf.is_active){
Socket::Connection S = server_socket.accept(); Socket::Connection S = server_socket.accept();

8
src/controller.cpp
View file

@ -189,7 +189,7 @@ void CheckProtocols(JSON::Value & p){
for (iter = new_connectors.begin(); iter != new_connectors.end(); iter++){ for (iter = new_connectors.begin(); iter != new_connectors.end(); iter++){
if (current_connectors.count(iter->first) != 1 || current_connectors[iter->first] != iter->second || !Util::Procs::isActive(iter->first)){ if (current_connectors.count(iter->first) != 1 || current_connectors[iter->first] != iter->second || !Util::Procs::isActive(iter->first)){
Log("CONF", "Starting connector: " + iter->second); Log("CONF", "Starting connector: " + iter->second);
Util::Procs::Start(iter->first, iter->second); Util::Procs::Start(iter->first, Util::getMyPath() + iter->second);
} }
} }
@ -230,7 +230,7 @@ void startStream(std::string name, JSON::Value & data){
if (URL.substr(0, 4) == "push"){ if (URL.substr(0, 4) == "push"){
std::string pusher = URL.substr(7); std::string pusher = URL.substr(7);
cmd2 = "MistBuffer -s "+name+" "+pusher; cmd2 = "MistBuffer -s "+name+" "+pusher;
Util::Procs::Start(name, cmd2); Util::Procs::Start(name, Util::getMyPath() + cmd2);
Log("BUFF", "(re)starting stream buffer "+name+" for push data from "+pusher); Log("BUFF", "(re)starting stream buffer "+name+" for push data from "+pusher);
}else{ }else{
if (URL.substr(0, 1) == "/"){ if (URL.substr(0, 1) == "/"){
@ -249,10 +249,10 @@ void startStream(std::string name, JSON::Value & data){
} }
cmd3 = "MistBuffer -s "+name; cmd3 = "MistBuffer -s "+name;
if (cmd2 != ""){ if (cmd2 != ""){
Util::Procs::Start(name, cmd1, cmd2, cmd3); Util::Procs::Start(name, cmd1, Util::getMyPath() + cmd2, Util::getMyPath() + cmd3);
Log("BUFF", "(re)starting stream buffer "+name+" for ffmpeg data: "+cmd1); Log("BUFF", "(re)starting stream buffer "+name+" for ffmpeg data: "+cmd1);
}else{ }else{
Util::Procs::Start(name, cmd1, cmd3); Util::Procs::Start(name, cmd1, Util::getMyPath() + cmd3);
Log("BUFF", "(re)starting stream buffer "+name+" using input file "+URL); Log("BUFF", "(re)starting stream buffer "+name+" using input file "+URL);
} }
} }