jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 16:24:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

made server threading optional

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-05-21 23:03:00 +02:00
parent c67bc65762
commit a4097659d3
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
servatrice/src/servatrice.cpp
View file

@ -26,11 +26,21 @@
#include "serversocketinterface.h"
#include "serversocketthread.h"
#include "protocol.h"
#include "server_logger.h"
#include "main.h"
void Servatrice_TcpServer::incomingConnection(int socketDescriptor)
{
ServerSocketThread *sst = new ServerSocketThread(socketDescriptor, server, this);
sst->start();
if (threaded) {
ServerSocketThread *sst = new ServerSocketThread(socketDescriptor, server, this);
sst->start();
} else {
QTcpSocket *socket = new QTcpSocket;
socket->setSocketDescriptor(socketDescriptor);
logger->logMessage(QString("incoming connection: %1").arg(socket->peerAddress().toString()));
new ServerSocketInterface(server, socket);
}
}
Servatrice::Servatrice(QSettings *_settings, QObject *parent)
@ -55,7 +65,8 @@ Servatrice::Servatrice(QSettings *_settings, QObject *parent)
statusUpdateClock->start(statusUpdateTime);
}
tcpServer = new Servatrice_TcpServer(this);
bool threaded = settings->value("server/threaded", false).toInt();
tcpServer = new Servatrice_TcpServer(this, threaded);
int port = settings->value("server/port", 4747).toInt();
qDebug() << "Starting server on port" << port;
if (tcpServer->listen(QHostAddress::Any, port))