summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2018-03-07 11:15:36 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2018-03-07 11:13:00 +0000
commitcfda70110b7aefcf339df12459e62b93e8f1a83d (patch)
tree71c981437ff7438e7f442e54ad93b5e1eef4b58b
parent8c90913ed4491f3786d40933324a695e8c736bfc (diff)
Only deliver warnings and higher to clients
Unfortunately on Windows there's regularly failures to get config descriptors for some devices. That's something I want in log files even if debug messages are disabled, but it happens too often on Windows to show to users. Change-Id: Ib6f1205074b8b8386175fda0ac1a91344d98ef8c Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
-rw-r--r--qdb/server/logging.cpp2
-rw-r--r--qdb/server/usb-host/usbdeviceenumerator.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/qdb/server/logging.cpp b/qdb/server/logging.cpp
index 6be719b..59af28c 100644
--- a/qdb/server/logging.cpp
+++ b/qdb/server/logging.cpp
@@ -74,7 +74,7 @@ void hostServerMessageHandler(QtMsgType type, const QMessageLogContext &context,
const auto message = qFormatLogMessage(type, context, msg);
const auto fullMsg = QString{"%1 %2\n"}.arg(prefix).arg(message).toUtf8();
- if (type == QtInfoMsg || type == QtWarningMsg || type == QtCriticalMsg || type == QtFatalMsg)
+ if (type == QtWarningMsg || type == QtCriticalMsg || type == QtFatalMsg)
Logging::instance().emitNewMessage(type, message);
auto written = logFile.write(fullMsg);
diff --git a/qdb/server/usb-host/usbdeviceenumerator.cpp b/qdb/server/usb-host/usbdeviceenumerator.cpp
index d2dc2a0..e49c87e 100644
--- a/qdb/server/usb-host/usbdeviceenumerator.cpp
+++ b/qdb/server/usb-host/usbdeviceenumerator.cpp
@@ -60,9 +60,9 @@ std::pair<bool, UsbInterfaceInfo> findQdbInterface(libusb_device *device)
const int ret = libusb_get_active_config_descriptor(device, &config);
if (ret != LIBUSB_SUCCESS) {
const auto address = getAddress(device);
- qCWarning(usbC) << "Could not get config descriptor for device at"
- << address.busNumber << ":" << address.deviceAddress
- << ":" << libusb_error_name(ret);
+ qCInfo(usbC) << "Could not get config descriptor for device at"
+ << address.busNumber << ":" << address.deviceAddress
+ << ":" << libusb_error_name(ret);
return std::make_pair(false, UsbInterfaceInfo{});
}
ScopeGuard configGuard = [&]() {