gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-18 07:45:51 -08:00
Code Issues Packages Projects Releases Wiki Activity

improved logging, improved server multithreading

Browse Source
This commit is contained in:
Max-Wilhelm Bruker
2011-03-22 17:55:20 +01:00
parent 8edc5b0635
commit fd7593edc1
11 changed files with 128 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
servatrice/src/server_logger.cpp
View File

@@ -2,19 +2,27 @@
#include <QSocketNotifier>
#include <QFile>
#include <QTextStream>
#include <QMutex>
#include <QDateTime>
#include <QThread>
#ifdef Q_OS_UNIX
#include <sys/types.h>
#include <sys/socket.h>
#endif
ServerLogger::ServerLogger(QObject *parent)
ServerLogger::ServerLogger(const QString &logFileName, QObject *parent)
: QObject(parent)
{
logFile = new QFile("server.log", this);
logFile->open(QIODevice::Append);
if (!logFileName.isEmpty()) {
logFile = new QFile(logFileName, this);
logFile->open(QIODevice::Append);
#ifdef Q_OS_UNIX
::socketpair(AF_UNIX, SOCK_STREAM, 0, sigHupFD);
::socketpair(AF_UNIX, SOCK_STREAM, 0, sigHupFD);
#endif
snHup = new QSocketNotifier(sigHupFD[1], QSocketNotifier::Read, this);
connect(snHup, SIGNAL(activated(int)), this, SLOT(handleSigHup()));
snHup = new QSocketNotifier(sigHupFD[1], QSocketNotifier::Read, this);
connect(snHup, SIGNAL(activated(int)), this, SLOT(handleSigHup()));
} else
logFile = 0;
}
ServerLogger::~ServerLogger()
@@ -23,18 +31,30 @@ ServerLogger::~ServerLogger()
void ServerLogger::logMessage(QString message)
{
if (!logFile)
return;
static QMutex mutex;
mutex.lock();
QTextStream stream(logFile);
stream << message << "\n";
stream << QDateTime::currentDateTime().toString() << " " << ((void *) QThread::currentThread()) << " " << message << "\n";
mutex.unlock();
}
void ServerLogger::hupSignalHandler(int /*unused*/)
{
if (!logFile)
return;
char a = 1;
::write(sigHupFD[0], &a, sizeof(a));
}
void ServerLogger::handleSigHup()
{
if (!logFile)
return;
snHup->setEnabled(false);
char tmp;
::read(sigHupFD[1], &tmp, sizeof(tmp));