Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 00:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

added --statusHost config option to allow us to specify the host name of the status page

Browse source
This commit is contained in:
ZappoMan 2014-03-26 13:25:38 -07:00
parent 18eda50118
commit 0451ce455f
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
assignment-client/src/octree/OctreeServer.cpp
View file

@ -216,6 +216,7 @@ OctreeServer::OctreeServer(const QByteArray& packet) :
_argv(NULL), _argv(NULL),
_parsedArgV(NULL), _parsedArgV(NULL),
_httpManager(NULL), _httpManager(NULL),
_statusPort(0),
_packetsPerClientPerInterval(10), _packetsPerClientPerInterval(10),
_packetsTotalPerInterval(DEFAULT_PACKETS_PER_INTERVAL), _packetsTotalPerInterval(DEFAULT_PACKETS_PER_INTERVAL),
_tree(NULL), _tree(NULL),
@ -867,10 +868,20 @@ void OctreeServer::run() {
const char* STATUS_PORT = "--statusPort"; const char* STATUS_PORT = "--statusPort";
const char* statusPort = getCmdOption(_argc, _argv, STATUS_PORT); const char* statusPort = getCmdOption(_argc, _argv, STATUS_PORT);
if (statusPort) { if (statusPort) {
_statusPortNumber = atoi(statusPort); _statusPort = atoi(statusPort);
initHTTPManager(_statusPortNumber); initHTTPManager(_statusPort);
} }
const char* STATUS_HOST = "--statusHost";
const char* statusHost = getCmdOption(_argc, _argv, STATUS_HOST);
if (statusHost) {
qDebug("--statusHost=%s", statusHost);
_statusHost = statusHost;
} else {
_statusHost = QHostAddress(getHostOrderLocalAddress()).toString();
}
qDebug("statusHost=%s", qPrintable(_statusHost));
const char* JURISDICTION_FILE = "--jurisdictionFile"; const char* JURISDICTION_FILE = "--jurisdictionFile";
const char* jurisdictionFile = getCmdOption(_argc, _argv, JURISDICTION_FILE); const char* jurisdictionFile = getCmdOption(_argc, _argv, JURISDICTION_FILE);
@ -1133,6 +1144,17 @@ QString OctreeServer::getConfiguration() {
return result; return result;
} }
QString OctreeServer::getStatusLink() {
QString result;
if (_statusPort > 0) {
QString detailedStats= QString("http://") + _statusHost + QString(":%1").arg(_statusPort);
result = "<a href='" + detailedStats + "'>"+detailedStats+"</a>";
} else {
result = "Status port not enabled.";
}
return result;
}
void OctreeServer::sendStatsPacket() { void OctreeServer::sendStatsPacket() {
// TODO: we have too many stats to fit in a single MTU... so for now, we break it into multiple JSON objects and // TODO: we have too many stats to fit in a single MTU... so for now, we break it into multiple JSON objects and
@ -1147,11 +1169,7 @@ void OctreeServer::sendStatsPacket() {
statsObject1[baseName + QString(".0.1.configuration")] = getConfiguration(); statsObject1[baseName + QString(".0.1.configuration")] = getConfiguration();
QString detailedStats= QString("http://") + QHostAddress(getHostOrderLocalAddress()).toString() statsObject1[baseName + QString(".0.2.detailed_stats_url")] = getStatusLink();
+ QString(":%1").arg(_statusPortNumber);
detailedStats = "<a href='" + detailedStats + "'>"+detailedStats+"</a>";
statsObject1[baseName + QString(".0.2.detailed_stats_url")] = detailedStats;
statsObject1[baseName + QString(".0.3.uptime")] = getUptime(); statsObject1[baseName + QString(".0.3.uptime")] = getUptime();
statsObject1[baseName + QString(".0.4.persistFileLoadTime")] = getFileLoadTime(); statsObject1[baseName + QString(".0.4.persistFileLoadTime")] = getFileLoadTime();

4
assignment-client/src/octree/OctreeServer.h
View file

@ -131,13 +131,15 @@ protected:
QString getUptime(); QString getUptime();
QString getFileLoadTime(); QString getFileLoadTime();
QString getConfiguration(); QString getConfiguration();
QString getStatusLink();
int _argc; int _argc;
const char** _argv; const char** _argv;
char** _parsedArgV; char** _parsedArgV;
HTTPManager* _httpManager; HTTPManager* _httpManager;
int _statusPortNumber; int _statusPort;
QString _statusHost;
char _persistFilename[MAX_FILENAME_LENGTH]; char _persistFilename[MAX_FILENAME_LENGTH];
int _packetsPerClientPerInterval; int _packetsPerClientPerInterval;