Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-05 21:12:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added logging to ice server and ice testing script.

Browse source
This commit is contained in:
OfficialR3ido101 2023-11-14 20:52:27 +00:00
parent 6722d31a12
commit 955f4dbc3e
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ice-server/src/IceServer.cpp
View file

@ -30,6 +30,7 @@
#include <udt/PacketHeaders.h> #include <udt/PacketHeaders.h>
#include <SharedUtil.h> #include <SharedUtil.h>
#include "WarningsSuppression.h" #include "WarningsSuppression.h"
#include <LogHandler.h>
const int CLEAR_INACTIVE_PEERS_INTERVAL_MSECS = 1 * 1000; const int CLEAR_INACTIVE_PEERS_INTERVAL_MSECS = 1 * 1000;
const int PEER_SILENCE_THRESHOLD_MSECS = 5 * 1000; const int PEER_SILENCE_THRESHOLD_MSECS = 5 * 1000;
@ -51,6 +52,9 @@ IceServer::IceServer(int argc, char* argv[]) :
const QCommandLineOption portOption("port", "Port for the ICE server to listen on", "port"); const QCommandLineOption portOption("port", "Port for the ICE server to listen on", "port");
parser.addOption(portOption); parser.addOption(portOption);
const QCommandLineOption logOption("logOptions", "Logging options, comma separated: ", "color,nocolor,process_id,thread_id,milliseconds,keep_repeats,journald,nojournald", "options");
parser.addOption(logOption);
if (!parser.parse(QCoreApplication::arguments())) { if (!parser.parse(QCoreApplication::arguments())) {
qCritical() << parser.errorText() << Qt::endl; qCritical() << parser.errorText() << Qt::endl;
parser.showHelp(); parser.showHelp();
@ -77,6 +81,17 @@ IceServer::IceServer(int argc, char* argv[]) :
port = parser.value(portOption).toInt(); port = parser.value(portOption).toInt();
} }
// We want to configure the logging system as early as possible
auto& logHandler = LogHandler::getInstance();
if (parser.isSet(logOption)) {
if (!logHandler.parseOptions(parser.value(logOption).toUtf8(), logOption.names().first())) {
QCoreApplication mockApp(argc, const_cast<char**>(argv)); // required for call to showHelp()
parser.showHelp();
Q_UNREACHABLE();
}
}
_serverSocket.bind(SocketType::UDP, address, port); _serverSocket.bind(SocketType::UDP, address, port);
qDebug() << "ice-server socket is listening on address: " << address.toString() << ":" << port; qDebug() << "ice-server socket is listening on address: " << address.toString() << ":" << port;

14
tools/ice-client/src/ICEClientApp.cpp
View file

@ -20,6 +20,7 @@
#include <PathUtils.h> #include <PathUtils.h>
#include <LimitedNodeList.h> #include <LimitedNodeList.h>
#include <NetworkLogging.h> #include <NetworkLogging.h>
#include <LogHandler.h>
ICEClientApp::ICEClientApp(int argc, char* argv[]) : ICEClientApp::ICEClientApp(int argc, char* argv[]) :
QCoreApplication(argc, argv) QCoreApplication(argc, argv)
@ -46,6 +47,9 @@ ICEClientApp::ICEClientApp(int argc, char* argv[]) :
const QCommandLineOption cacheSTUNOption("s", "cache stun-server response"); const QCommandLineOption cacheSTUNOption("s", "cache stun-server response");
parser.addOption(cacheSTUNOption); parser.addOption(cacheSTUNOption);
const QCommandLineOption logOption("logOptions", "Logging options, comma separated: ", "color,nocolor,process_id,thread_id,milliseconds,keep_repeats,journald,nojournald", "options");
parser.addOption(logOption);
if (!parser.parse(QCoreApplication::arguments())) { if (!parser.parse(QCoreApplication::arguments())) {
qCritical() << parser.errorText() << Qt::endl; qCritical() << parser.errorText() << Qt::endl;
parser.showHelp(); parser.showHelp();
@ -81,6 +85,16 @@ ICEClientApp::ICEClientApp(int argc, char* argv[]) :
} }
} }
// We want to configure the logging system as early as possible
auto& logHandler = LogHandler::getInstance();
if (parser.isSet(logOption)) {
if (!logHandler.parseOptions(parser.value(logOption).toUtf8(), logOption.names().first())) {
QCoreApplication mockApp(argc, const_cast<char**>(argv)); // required for call to showHelp()
parser.showHelp();
Q_UNREACHABLE();
}
}
_iceServerAddr = SockAddr(SocketType::UDP, "127.0.0.1", ICE_SERVER_DEFAULT_PORT); _iceServerAddr = SockAddr(SocketType::UDP, "127.0.0.1", ICE_SERVER_DEFAULT_PORT);
if (parser.isSet(iceServerAddressOption)) { if (parser.isSet(iceServerAddressOption)) {
// parse the IP and port combination for this target // parse the IP and port combination for this target