diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-11-05 19:15:19 +0100 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-11-13 19:29:48 +0000 |
| commit | 328db7b395a1df970ccc641b2077c5c6ecbcf7de (patch) | |
| tree | dd3911db9dc995797e2d8cfbba08f56c645308fd /src/plugins/canbus/socketcan | |
| parent | 9de99ca2d395037a092a9003cad3dbb7bb5fde98 (diff) | |
CAN: Introduce categorized logging
[ChangeLog][CAN bus] Introduced categorized logging to the
CAN bus module which can be enabled by the "qt.canbus" and
"qt.canbus.plugins.<pluginname>" filters.
Change-Id: Ib39c0b2ebcd967cd7812602190807ad3488ccb18
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/plugins/canbus/socketcan')
| -rw-r--r-- | src/plugins/canbus/socketcan/main.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/plugins/canbus/socketcan/main.cpp b/src/plugins/canbus/socketcan/main.cpp index 92e759b..328db97 100644 --- a/src/plugins/canbus/socketcan/main.cpp +++ b/src/plugins/canbus/socketcan/main.cpp @@ -40,10 +40,12 @@ #include <QtSerialBus/qcanbusdevice.h> #include <QtSerialBus/qcanbusfactory.h> -#include <QtCore/qfile.h> +#include <QtCore/qloggingcategory.h> QT_BEGIN_NAMESPACE +Q_LOGGING_CATEGORY(QT_CANBUS_PLUGINS_SOCKETCAN, "qt.canbus.plugins.socketcan") + //! [SocketCanFactory] class SocketCanBusPlugin : public QObject, public QCanBusFactoryV2 { diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index 021c309..ddda3a9 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -40,6 +40,7 @@ #include <QtCore/qdebug.h> #include <QtCore/qdiriterator.h> #include <QtCore/qfile.h> +#include <QtCore/qloggingcategory.h> #include <QtCore/qsocketnotifier.h> #include <linux/can/error.h> @@ -76,6 +77,8 @@ struct canfd_frame { QT_BEGIN_NAMESPACE +Q_DECLARE_LOGGING_CATEGORY(QT_CANBUS_PLUGINS_SOCKETCAN) + const char sysClassNetC[] = "/sys/class/net/"; const char flagsC[] = "/flags"; const char mtuC[] = "/mtu"; @@ -242,7 +245,7 @@ bool SocketCanBackend::applyConfigurationParameter(int key, const QVariant &valu socklen_t s = sizeof(can_filter); if (Q_UNLIKELY(setsockopt(canSocket, SOL_CAN_RAW, CAN_RAW_FILTER, &filters, s) != 0)) { - qWarning("Cannot unset socket filters"); + qCWarning(QT_CANBUS_PLUGINS_SOCKETCAN, "Cannot unset socket filters."); setError(qt_error_string(errno), QCanBusDevice::CanBusError::ConfigurationError); break; @@ -366,8 +369,8 @@ bool SocketCanBackend::connectSocket() const QVariant param = configurationParameter(key); bool success = applyConfigurationParameter(key, param); if (Q_UNLIKELY(!success)) { - qWarning("Cannot apply parameter: %d with value: %ls", - key, qUtf16Printable(param.toString())); + qCWarning(QT_CANBUS_PLUGINS_SOCKETCAN, "Cannot apply parameter: %d with value: %ls.", + key, qUtf16Printable(param.toString())); } } @@ -436,7 +439,7 @@ bool SocketCanBackend::writeFrame(const QCanBusFrame &newData) if (Q_UNLIKELY(!canFdOptionEnabled && newData.hasFlexibleDataRateFormat())) { const QString error = tr("Cannot write CAN FD frame because CAN FD option is not enabled."); - qDebug("%ls", qUtf16Printable(error)); + qCWarning(QT_CANBUS_PLUGINS_SOCKETCAN, "%ls", qUtf16Printable(error)); setError(error, QCanBusDevice::WriteError); return false; } |