jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed #45: Terminate servatrice if critical error in e.g. listen() happens during initialization

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-05-01 10:58:08 +02:00
parent 875610e1b3
commit 7c8b3fc5e3
3 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

26
servatrice/src/servatrice.cpp
View file

@ -64,6 +64,16 @@ void Servatrice_IslServer::incomingConnection(int socketDescriptor)
Servatrice::Servatrice(QSettings *_settings, QObject *parent)
: Server(parent), dbMutex(QMutex::Recursive), settings(_settings), uptime(0), shutdownTimer(0)
{
}
Servatrice::~Servatrice()
{
prepareDestroy();
QSqlDatabase::database().close();
}
bool Servatrice::initServer()
{
serverName = settings->value("server/name").toString();
serverId = settings->value("server/id", 0).toInt();
@ -192,10 +202,10 @@ Servatrice::Servatrice(QSettings *_settings, QObject *parent)
if (islServer->listen(QHostAddress::Any, networkPort))
qDebug() << "ISL server listening.";
else
throw QString("islServer->listen(): Error.");
throw QString("islServer->listen()");
} } catch (QString error) {
qDebug() << "ERROR --" << error;
return false;
}
pingClock = new QTimer(this);
@ -216,15 +226,11 @@ Servatrice::Servatrice(QSettings *_settings, QObject *parent)
qDebug() << "Starting server on port" << gamePort;
if (gameServer->listen(QHostAddress::Any, gamePort))
qDebug() << "Server listening.";
else
else {
qDebug() << "gameServer->listen(): Error.";
}
Servatrice::~Servatrice()
{
prepareDestroy();
QSqlDatabase::database().close();
return false;
}
return true;
}
bool Servatrice::openDatabase()