aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

extra logging

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-07-09 12:14:07 +02:00
parent 5e3db65846
commit fbc9ff7601
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
servatrice/src/server_logger.cpp
View file

@ -31,13 +31,16 @@ ServerLogger::~ServerLogger()
flushBuffer(); flushBuffer();
} }
void ServerLogger::logMessage(QString message) void ServerLogger::logMessage(QString message, ServerSocketInterface *ssi)
{ {
if (!logFile) if (!logFile)
return; return;
bufferMutex.lock(); bufferMutex.lock();
buffer.append(QDateTime::currentDateTime().toString() + " " + QString::number((qulonglong) QThread::currentThread(), 16) + " " + message); QString ssiString;
if (ssi)
ssiString = QString::number((qulonglong) ssi) + " ";
buffer.append(QDateTime::currentDateTime().toString() + " " + QString::number((qulonglong) QThread::currentThread(), 16) + " " + ssiString + message);
bufferMutex.unlock(); bufferMutex.unlock();
emit sigFlushBuffer(); emit sigFlushBuffer();

3
servatrice/src/server_logger.h
View file

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

3
servatrice/src/serversocketinterface.cpp
View file

@ -93,7 +93,8 @@ void ServerSocketInterface::flushXmlBuffer()
void ServerSocketInterface::readClient() void ServerSocketInterface::readClient()
{ {
QByteArray data = socket->readAll(); QByteArray data = socket->readAll();
logger->logMessage(QString(data)); if (!data.contains("<cmd type=\"ping\""))
logger->logMessage(QString(data), this);
xmlReader->addData(data); xmlReader->addData(data);
while (!xmlReader->atEnd()) { while (!xmlReader->atEnd()) {