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 launch sequence to avoid http port collisions

Browse Source
This commit is contained in:
Luis Ángel San Martín 2021-01-25 15:48:15 +01:00
parent f183fc1dd2
commit d96d01d963
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
YACReaderLibrary/main.cpp
View File

@ -215,16 +215,6 @@ int main(int argc, char **argv)
}
}
#ifdef SERVER_RELEASE
QSettings *settings = new QSettings(YACReader::getSettingsPath() + "/YACReaderLibrary.ini", QSettings::IniFormat); //TODO unificar la creaci<63>n del fichero de config con el servidor
settings->beginGroup("libraryConfig");
s = new Startup();
if (settings->value(SERVER_ON, true).toBool()) {
s->start();
}
#endif
QLOG_INFO() << "YACReaderLibrary attempting to start";
logSystemAndConfig();
@ -237,8 +227,20 @@ int main(int argc, char **argv)
#endif
return 0;
}
QLOG_INFO() << "YACReaderLibrary starting";
#ifdef SERVER_RELEASE
QSettings *settings = new QSettings(YACReader::getSettingsPath() + "/YACReaderLibrary.ini", QSettings::IniFormat); //TODO unificar la creaci<63>n del fichero de config con el servidor
settings->beginGroup("libraryConfig");
s = new Startup();
if (settings->value(SERVER_ON, true).toBool()) {
s->start();
}
#endif
auto localServer = new YACReaderLocalServer();
auto mw = new LibraryWindow();

28
YACReaderLibraryServer/main.cpp
View File

@ -175,6 +175,21 @@ int main(int argc, char **argv)
qRegisterMetaType<ComicDB>("ComicDB");
QLOG_INFO() << "YACReaderLibraryServer attempting to start";
logSystemAndConfig();
if (YACReaderLocalServer::isRunning()) // allow one server instance
{
QLOG_WARN() << "another instance of YACReaderLibrary is running";
#ifdef Q_OS_WIN
logger.shutDownLoggerThread();
#endif
return 0;
}
QLOG_INFO() << "YACReaderLibrary starting";
QSettings *settings = new QSettings(YACReader::getSettingsPath() + "/" + QCoreApplication::applicationName() + ".ini", QSettings::IniFormat);
settings->beginGroup("libraryConfig");
@ -195,19 +210,6 @@ int main(int argc, char **argv)
s->start();
}
QLOG_INFO() << "YACReaderLibraryServer attempting to start";
logSystemAndConfig();
if (YACReaderLocalServer::isRunning()) // allow one server instance
{
QLOG_WARN() << "another instance of YACReaderLibrary is running";
#ifdef Q_OS_WIN
logger.shutDownLoggerThread();
#endif
return 0;
}
QLOG_INFO() << "YACReaderLibrary starting";
QLOG_INFO() << "Running on port" << s->getPort();
//Update libraries to now versions