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

Added checksum to stats of HTTP based outputs for later merging of connections.

Browse source
This commit is contained in:
Thulinma 2014-10-23 15:12:33 +02:00
parent c26661b690
commit b325ca96ee
13 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controller/controller_statistics.cpp
View file

@ -15,6 +15,7 @@
#define STAT_CLI_UP 64
#define STAT_CLI_BPS_DOWN 128
#define STAT_CLI_BPS_UP 256
#define STAT_CLI_CRC 512
#define STAT_CLI_ALL 0xFFFF
// These are used to store "totals" field requests in a bitfield for speedup.
#define STAT_TOT_CLIENTS 1
@ -31,7 +32,7 @@ std::map<unsigned long, Controller::statStorage> Controller::curConns;///<Connec
/// old statistics that have disconnected over 10 minutes ago.
void Controller::SharedMemStats(void * config){
DEBUG_MSG(DLVL_HIGH, "Starting stats thread");
IPC::sharedServer statServer("statistics", 88, true);
IPC::sharedServer statServer("statistics", STAT_EX_SIZE, true);
while(((Util::Config*)config)->is_active){
//parse current users
statServer.parseEach(parseStatistics);
@ -63,6 +64,7 @@ void Controller::statStorage::update(IPC::statExchange & data) {
if (!connector.size()){
connector = data.connector();
}
crc = data.crc();
statLog tmp;
tmp.time = data.time();
tmp.lastSecond = data.lastSecond();
@ -193,6 +195,7 @@ void Controller::fillClients(JSON::Value & req, JSON::Value & rep){
if (fields & STAT_CLI_UP){rep["fields"].append("up");}
if (fields & STAT_CLI_BPS_DOWN){rep["fields"].append("downbps");}
if (fields & STAT_CLI_BPS_UP){rep["fields"].append("upbps");}
if (fields & STAT_CLI_CRC){rep["fields"].append("crc");}
//output the data itself
rep["data"].null();
//start with current connections
@ -233,6 +236,7 @@ void Controller::fillClients(JSON::Value & req, JSON::Value & rep){
d.append(statRef->second.up);
}
}
if (fields & STAT_CLI_CRC){d.append((long long)it->second.crc);}
rep["data"].append(d);
}
}
@ -272,6 +276,7 @@ void Controller::fillClients(JSON::Value & req, JSON::Value & rep){
d.append(statRef->second.up);
}
}
if (fields & STAT_CLI_CRC){d.append((long long)it->second.crc);}
rep["data"].append(d);
}
}

1
src/controller/controller_statistics.h
View file

@ -18,6 +18,7 @@ namespace Controller {
public:
void update(IPC::statExchange & data);
std::string host;
unsigned int crc;
std::string streamName;
std::string connector;
std::map<unsigned long long, statLog> log;