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

Allow overriding application name with -DAPPNAME="Name here"

Browse source
This commit is contained in:
Thulinma 2019-11-28 01:58:12 +01:00
parent a8e04e1787
commit 771fad390a
21 changed files with 57 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controller/controller.cpp
View file

@ -212,7 +212,7 @@ int main_loop(int argc, char **argv){
strftime(buffer, 25, "%c", timeinfo);
std::cerr << std::endl
<< std::endl
<< "!----MistServer Started at " << buffer << " ----!" << std::endl;
<< "!----" APPNAME " Started at " << buffer << " ----!" << std::endl;
}
}
// reload config from config file

6
src/controller/controller_api.cpp
View file

@ -344,7 +344,7 @@ int Controller::handleAPIConnection(Socket::Connection &conn){
if (!authorized){
H.Clean();
H.body = "Please login first or provide a valid token authentication.";
H.SetHeader("Server", "MistServer/" PACKAGE_VERSION);
H.SetHeader("Server", APPIDENT);
H.SetHeader("WWW-Authenticate", "json " + req["authorize"].toString());
H.SendResponse("403", "Not authorized", conn);
H.Clean();
@ -358,7 +358,7 @@ int Controller::handleAPIConnection(Socket::Connection &conn){
if (!authorized){
H.Clean();
H.body = "Please login first or provide a valid token authentication.";
H.SetHeader("Server", "MistServer/" PACKAGE_VERSION);
H.SetHeader("Server", APPIDENT);
H.SendResponse("403", "Not authorized", conn);
H.Clean();
continue;
@ -388,7 +388,7 @@ int Controller::handleAPIConnection(Socket::Connection &conn){
H.Clean();
H.SetHeader("Content-Type", "text/html");
H.SetHeader("X-Info", "To force an API response, request the file /api");
H.SetHeader("Server", "MistServer/" PACKAGE_VERSION);
H.SetHeader("Server", APPIDENT);
H.SetHeader("Content-Length", server_html_len);
H.SetHeader("X-UA-Compatible", "IE=edge;chrome=1");
H.SendResponse("200", "OK", conn);

4
src/controller/controller_capabilities.cpp
View file

@ -16,13 +16,13 @@ namespace Controller{
/// Generate list of available triggers, storing in global 'capabilities' JSON::Value.
void checkAvailTriggers(){
JSON::Value &trgs = capabilities["triggers"];
trgs["SYSTEM_START"]["when"] = "After MistServer boot";
trgs["SYSTEM_START"]["when"] = "After " APPNAME " boot";
trgs["SYSTEM_START"]["stream_specific"] = false;
trgs["SYSTEM_START"]["payload"] = "";
trgs["SYSTEM_START"]["response"] = "always";
trgs["SYSTEM_START"]["response_action"] = "If false, shuts down the server.";
trgs["SYSTEM_STOP"]["when"] = "Before MistServer shuts down";
trgs["SYSTEM_STOP"]["when"] = "Before " APPNAME " shuts down";
trgs["SYSTEM_STOP"]["stream_specific"] = false;
trgs["SYSTEM_STOP"]["payload"] = "shutdown reason (string)";
trgs["SYSTEM_STOP"]["response"] = "always";

2
src/controller/controller_statistics.cpp
View file

@ -1474,7 +1474,7 @@ void Controller::handlePrometheus(HTTP::Parser &H, Socket::Connection &conn, int
if (H.GetVar("jsonp") != ""){jsonp = H.GetVar("jsonp");}
break;
}
H.SetHeader("Server", "MistServer/" PACKAGE_VERSION);
H.SetHeader("Server", APPIDENT);
H.StartResponse("200", "OK", H, conn, true);
// Collect core server stats