stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Web interface: Fix garbage in status message caused

Browse source
This commit is contained in:
Jan Kaluza 2016-01-22 07:37:25 +01:00
parent 38bf3f0bed
commit 8eb12094c6
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
spectrum_manager/src/APIServer.cpp
View file

@ -78,12 +78,10 @@ void APIServer::send_ack(struct mg_connection *conn, bool error, const std::stri
}
void APIServer::serve_instances(Server *server, Server::session *session, struct mg_connection *conn, struct http_message *hm) {
// std::string jid = get_http_var(hm, "jid");
// if (!jid.empty()) {
// serve_instance(conn, hm, jid);
// return;
// }
// rapidjson stores const char* pointer to status, so we have to keep
// the std::string stored out of BOOST_FOREACH scope, otherwise the
// const char * returned by c_str() would be invalid during send_json.
std::vector<std::string> statuses;
std::vector<std::string> list = show_list(m_config, false);
Document json;
@ -101,7 +99,9 @@ void APIServer::serve_instances(Server *server, Server::session *session, struct
if (status.empty()) {
status = "Cannot get the instance status.";
}
instance.AddMember("status", status.c_str(), json.GetAllocator());
statuses.push_back(status);
instance.AddMember("status", statuses.back().c_str(), json.GetAllocator());
bool running = true;
if (status.find("Running") == std::string::npos) {

1
spectrum_manager/src/server.cpp
View file

@ -390,6 +390,7 @@ void Server::serve_logout(struct mg_connection *conn, struct http_message *hm) {
}
void Server::serve_oauth2(struct mg_connection *conn, struct http_message *hm) {
// http://slack.spectrum.im/oauth2/localhostxmpp?code=14830663267.19140123492.e7f78a836d&state=534ab3b6-8bf1-4974-8274-847df8490bc5
std::cout << "OAUTH2 handler\n";
}