mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix port settings

Browse Source 
When setting ports, temporary or for good, we need to go via the config
files and not QTcpServer or we get undefined behavior. To support temp
ports, we need to back up the fixed port in the settings.
This commit is contained in:
Felix Kauselmann 2020-11-25 21:12:16 +01:00
parent e79ea56d32
commit c4f792bd40
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
YACReaderLibrary/server/startup.cpp
View File

@ -110,20 +110,42 @@ void Startup::start(quint16 port)
if (listenerSettings->value("minThreads").isNull())
listenerSettings->setValue("minThreads", 50);
if (listenerSettings->value("port").isNull())
listenerSettings->setValue("port", 8080);
// start with a temporary port
if (port != 0) {
// cache saved port
if (!listenerSettings->contains("cachedPort")) {
listenerSettings->setValue("cachedPort", listenerSettings->value("port").toInt());
}
listenerSettings->setValue("port", port);
} else {
// restore saved port
if (listenerSettings->contains("cachedPort")) {
listenerSettings->setValue("port", listenerSettings->value("cachedPort"));
listenerSettings->remove("cachedPort");
}
}
// test if port is working
{
QTcpServer testServer;
if (!testServer.listen(QHostAddress::Any, listenerSettings->value("port").toInt())) {
qDebug("Port is busy.");
// get random port
testServer.listen(QHostAddress::Any, 0);
listenerSettings->setValue("port", testServer.serverPort());
}
testServer.close();
}
listener = new HttpListener(listenerSettings, new RequestMapper(app), app);
if (port != 0) {
if (listener->isListening()) {
listener->close();
}
listener->QTcpServer::listen(QHostAddress::Any, port);
if (listener->isListening()) {
qDebug("ServiceHelper: Service has started");
} else {
qDebug("ServiceHelper: Could not launch service");
}
// if the requested port is busy, use random port
if (!listener->isListening()) {
listener->QTcpServer::listen(QHostAddress::Any, 0);
}
qDebug("ServiceHelper: Service has started");
}
void Startup::stop()