summaryrefslogtreecommitdiffstats
path: root/libqdb
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2016-11-21 14:51:22 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2016-11-23 12:36:24 +0000
commit2750685b372b78330a9139a98d084bb7a60e367e (patch)
tree138d48b393bd1d060dcaf4755a9371a2239364d5 /libqdb
parentfd46f3107674723545e86a9b145c107d33d14f72 (diff)
Categorize logging
Also use qFormatLogMessage so that QT_MESSAGE_PATTERN is taken into account in host server's own log message handler. Change-Id: I2ae6f70021cbe1ce4cd31ed599bbcc5035081b12 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'libqdb')
-rw-r--r--libqdb/protocol/qdbtransport.cpp6
-rw-r--r--libqdb/stream.cpp1
2 files changed, 3 insertions, 4 deletions
diff --git a/libqdb/protocol/qdbtransport.cpp b/libqdb/protocol/qdbtransport.cpp
index d95432b..43353b0 100644
--- a/libqdb/protocol/qdbtransport.cpp
+++ b/libqdb/protocol/qdbtransport.cpp
@@ -26,7 +26,7 @@
#include <QtCore/qdebug.h>
#include <QtCore/qloggingcategory.h>
-Q_LOGGING_CATEGORY(transportC, "transport");
+Q_LOGGING_CATEGORY(transportC, "qdb.transport");
QdbTransport::QdbTransport(QIODevice *io)
: m_io{io}
@@ -54,7 +54,7 @@ bool QdbTransport::send(const QdbMessage &message)
int count = m_io->write(buf.constData(), messageSize);
if (count != messageSize) {
- qCritical() << "QdbTransport::send() could not write entire message of" << messageSize << ", only wrote" << count;
+ qCCritical(transportC) << "Could not write entire message of" << messageSize << "bytes, only wrote" << count;
return false;
}
@@ -67,7 +67,7 @@ QdbMessage QdbTransport::receive()
QByteArray buf{qdbMessageSize, '\0'};
int count = m_io->read(buf.data(), buf.size());
if (count < qdbHeaderSize) {
- qDebug() << "QdbTransport::receive() could only read" << count << "out of package header's" << qdbHeaderSize;
+ qCCritical(transportC) << "Could only read" << count << "bytes out of package header's" << qdbHeaderSize;
return QdbMessage{QdbMessage::Invalid, 0, 0};
}
QDataStream stream{buf};
diff --git a/libqdb/stream.cpp b/libqdb/stream.cpp
index 940d16b..eabe905 100644
--- a/libqdb/stream.cpp
+++ b/libqdb/stream.cpp
@@ -24,7 +24,6 @@
#include "protocol/protocol.h"
#include <QtCore/qdatastream.h>
-#include <QtCore/qdebug.h>
QByteArray wrapPacket(const StreamPacket &packet)
{