jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 19:47:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

server code cleanup, changed in-game ping event to not use any bandwidth as long as nothing changes

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-01-29 13:36:43 +01:00
parent a64df4a0f5
commit 4895f2b4fd
27 changed files with 232 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

2
servatrice/src/server_logger.cpp
View file

@ -31,7 +31,7 @@ ServerLogger::~ServerLogger()
flushBuffer();
}
void ServerLogger::logMessage(QString message, ServerSocketInterface *ssi)
void ServerLogger::logMessage(QString message, Server_ProtocolHandler *ssi)
{
if (!logFile)
return;

4
servatrice/src/server_logger.h
View file

@ -9,7 +9,7 @@
class QSocketNotifier;
class QFile;
class ServerSocketInterface;
class Server_ProtocolHandler;
class ServerLogger : public QObject {
Q_OBJECT
@ -18,7 +18,7 @@ public:
~ServerLogger();
static void hupSignalHandler(int unused);
public slots:
void logMessage(QString message, ServerSocketInterface *ssi = 0);
void logMessage(QString message, Server_ProtocolHandler *ssi = 0);
private slots:
void handleSigHup();
void flushBuffer();

2
servatrice/src/serversocketinterface.cpp
View file

@ -57,6 +57,7 @@ ServerSocketInterface::ServerSocketInterface(Servatrice *_server, QTcpSocket *_s
connect(socket, SIGNAL(disconnected()), this, SLOT(deleteLater()));
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(catchSocketError(QAbstractSocket::SocketError)));
connect(this, SIGNAL(outputBufferChanged()), this, SLOT(flushOutputBuffer()), Qt::QueuedConnection);
connect(this, SIGNAL(logDebugMessage(const QString &, Server_ProtocolHandler *)), logger, SLOT(logMessage(QString, Server_ProtocolHandler *)));
Event_ServerIdentification identEvent;
identEvent.set_server_name(servatrice->getServerName().toStdString());
@ -125,7 +126,6 @@ void ServerSocketInterface::readClient()
CommandContainer newCommandContainer;
newCommandContainer.ParseFromArray(inputBuffer.data(), messageLength);
logger->logMessage(QString::fromStdString(newCommandContainer.ShortDebugString()), this);
inputBuffer.remove(0, messageLength);
messageInProgress = false;