|
|
@@ -1,7 +1,7 @@
|
|
|
#include "soft_bus_core.h"
|
|
|
#include <QByteArray>
|
|
|
#include <QDateTime>
|
|
|
-#include <QDebug>
|
|
|
+#include "utils/logging.h"
|
|
|
#include <QHashFunctions>
|
|
|
#include <QJsonDocument>
|
|
|
#include <QSqlError>
|
|
|
@@ -98,7 +98,7 @@ void DeviceBusCore::closeDB() {
|
|
|
*/
|
|
|
void DeviceBusCore::registerDevice(const DeviceInfo &device) {
|
|
|
if (m_devices.contains(device.id)) {
|
|
|
- qWarning() << "Device" << device.id << "is already registered";
|
|
|
+ LOG_WARNING() << "Device" << device.id << "is already registered";
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -163,11 +163,11 @@ void DeviceBusCore::registerDevice(const DeviceInfo &device) {
|
|
|
upsertDeviceRecord(normalizedDevice, normalizedDevice.lastSeen);
|
|
|
if (!normalizedDevice.portname.isEmpty()) {
|
|
|
if (!ensurePerPortRawTable(normalizedDevice.portname)) {
|
|
|
- qCritical() << "Failed to ensure raw data table for port"
|
|
|
+ LOG_CRITICAL() << "Failed to ensure raw data table for port"
|
|
|
<< normalizedDevice.portname;
|
|
|
}
|
|
|
if (!ensurePerPortTransformedTable(normalizedDevice.portname)) {
|
|
|
- qCritical() << "Failed to ensure transformed data table for port"
|
|
|
+ LOG_CRITICAL() << "Failed to ensure transformed data table for port"
|
|
|
<< normalizedDevice.portname;
|
|
|
}
|
|
|
}
|
|
|
@@ -190,7 +190,7 @@ bool DeviceBusCore::fetchPersistedDeviceByPort(const QString &portName,
|
|
|
"FROM devices WHERE port_name = :port_name LIMIT 1"));
|
|
|
query.bindValue(QStringLiteral(":port_name"), portName);
|
|
|
if (!query.exec()) {
|
|
|
- qCritical() << "Failed to query persisted device for port" << portName
|
|
|
+ LOG_CRITICAL() << "Failed to query persisted device for port" << portName
|
|
|
<< ":" << query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -248,7 +248,7 @@ bool DeviceBusCore::fetchPersistedDeviceByPort(const QString &portName,
|
|
|
*/
|
|
|
void DeviceBusCore::updateDevice(const DeviceInfo &device) {
|
|
|
if (!m_devices.contains(device.id)) {
|
|
|
- qWarning() << "Device" << device.id << "is not registered";
|
|
|
+ LOG_WARNING() << "Device" << device.id << "is not registered";
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -282,11 +282,11 @@ void DeviceBusCore::updateDevice(const DeviceInfo &device) {
|
|
|
upsertDeviceRecord(updatedDevice, updatedDevice.lastSeen);
|
|
|
if (!updatedDevice.portname.isEmpty()) {
|
|
|
if (!ensurePerPortRawTable(updatedDevice.portname)) {
|
|
|
- qCritical() << "Failed to ensure raw data table for port"
|
|
|
+ LOG_CRITICAL() << "Failed to ensure raw data table for port"
|
|
|
<< updatedDevice.portname;
|
|
|
}
|
|
|
if (!ensurePerPortTransformedTable(updatedDevice.portname)) {
|
|
|
- qCritical() << "Failed to ensure transformed data table for port"
|
|
|
+ LOG_CRITICAL() << "Failed to ensure transformed data table for port"
|
|
|
<< updatedDevice.portname;
|
|
|
}
|
|
|
}
|
|
|
@@ -297,13 +297,13 @@ void DeviceBusCore::updateDevice(const DeviceInfo &device) {
|
|
|
|
|
|
void DeviceBusCore::markDeviceOffline(int deviceId) {
|
|
|
if (deviceId <= 0) {
|
|
|
- qWarning() << "Invalid device id when marking offline";
|
|
|
+ LOG_WARNING() << "Invalid device id when marking offline";
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
const bool tracked = m_devices.contains(deviceId);
|
|
|
if (!tracked) {
|
|
|
- qWarning() << "Device" << deviceId
|
|
|
+ LOG_WARNING() << "Device" << deviceId
|
|
|
<< "not tracked in memory when marking offline";
|
|
|
if (m_dbInitialized) {
|
|
|
markDeviceInactive(deviceId);
|
|
|
@@ -317,12 +317,12 @@ void DeviceBusCore::markDeviceOffline(int deviceId) {
|
|
|
|
|
|
void DeviceBusCore::markDeviceOfflineByPort(const QString &portname) {
|
|
|
if (portname.isEmpty()) {
|
|
|
- qWarning() << "Empty port name when marking device offline";
|
|
|
+ LOG_WARNING() << "Empty port name when marking device offline";
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
if (!m_portnameToId.contains(portname)) {
|
|
|
- qWarning() << "No registered device found for port" << portname
|
|
|
+ LOG_WARNING() << "No registered device found for port" << portname
|
|
|
<< "when marking offline";
|
|
|
return;
|
|
|
}
|
|
|
@@ -334,12 +334,12 @@ void DeviceBusCore::markDeviceOfflineByPort(const QString &portname) {
|
|
|
void DeviceBusCore::updateDeviceStatus(int deviceId, const QString &status,
|
|
|
bool isActive, const QDateTime &lastSeen) {
|
|
|
if (deviceId <= 0) {
|
|
|
- qWarning() << "Invalid device id when updating status";
|
|
|
+ LOG_WARNING() << "Invalid device id when updating status";
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
if (!m_devices.contains(deviceId)) {
|
|
|
- qWarning() << "Device" << deviceId
|
|
|
+ LOG_WARNING() << "Device" << deviceId
|
|
|
<< "not tracked in memory when updating status";
|
|
|
return;
|
|
|
}
|
|
|
@@ -368,12 +368,12 @@ void DeviceBusCore::updateDeviceStatusByPort(const QString &portname,
|
|
|
const QString &status, bool isActive,
|
|
|
const QDateTime &lastSeen) {
|
|
|
if (portname.isEmpty()) {
|
|
|
- qWarning() << "Empty port name when updating device status";
|
|
|
+ LOG_WARNING() << "Empty port name when updating device status";
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
if (!m_portnameToId.contains(portname)) {
|
|
|
- qWarning() << "No registered device found for port" << portname
|
|
|
+ LOG_WARNING() << "No registered device found for port" << portname
|
|
|
<< "when updating status";
|
|
|
return;
|
|
|
}
|
|
|
@@ -398,7 +398,7 @@ void DeviceBusCore::updateDeviceStatusByPort(const QString &portname,
|
|
|
*/
|
|
|
void DeviceBusCore::unregisterDevice(int deviceId) {
|
|
|
if (!m_devices.contains(deviceId)) {
|
|
|
- qWarning() << "Device" << deviceId << "is not registered";
|
|
|
+ LOG_WARNING() << "Device" << deviceId << "is not registered";
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -495,7 +495,7 @@ void DeviceBusCore::routeMessage(const BusMessage &message) {
|
|
|
*/
|
|
|
void DeviceBusCore::storeRawData(int deviceId, const QByteArray &data) {
|
|
|
if (!m_dbInitialized || !m_db.isValid() || !m_db.isOpen()) {
|
|
|
- qWarning() << "Database not initialized for storing raw data";
|
|
|
+ LOG_WARNING() << "Database not initialized for storing raw data";
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -509,7 +509,7 @@ void DeviceBusCore::storeRawData(int deviceId, const QByteArray &data) {
|
|
|
|
|
|
// 确认端口对应的原始数据表已创建
|
|
|
if (!ensurePerPortRawTable(portName)) {
|
|
|
- qCritical() << "Failed to ensure port-specific raw data table for"
|
|
|
+ LOG_CRITICAL() << "Failed to ensure port-specific raw data table for"
|
|
|
<< portName;
|
|
|
return;
|
|
|
}
|
|
|
@@ -551,7 +551,7 @@ void DeviceBusCore::storeRawData(int deviceId, const QByteArray &data) {
|
|
|
|
|
|
if (!query.exec()) {
|
|
|
const QString errorText = query.lastError().text();
|
|
|
- qCritical() << "Failed to store raw data:" << errorText;
|
|
|
+ LOG_CRITICAL() << "Failed to store raw data:" << errorText;
|
|
|
emit databaseError(errorText);
|
|
|
return;
|
|
|
}
|
|
|
@@ -578,7 +578,7 @@ void DeviceBusCore::storeRawData(int deviceId, const QByteArray &data) {
|
|
|
*/
|
|
|
void DeviceBusCore::storeBusMessage(const BusMessage &message) {
|
|
|
if (!m_dbInitialized || !m_db.isValid() || !m_db.isOpen()) {
|
|
|
- qWarning() << "Database not initialized for storing bus message";
|
|
|
+ LOG_WARNING() << "Database not initialized for storing bus message";
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -608,7 +608,7 @@ void DeviceBusCore::storeBusMessage(const BusMessage &message) {
|
|
|
|
|
|
if (!query.exec()) {
|
|
|
const QString errorText = query.lastError().text();
|
|
|
- qCritical() << "Failed to store bus message:" << errorText;
|
|
|
+ LOG_CRITICAL() << "Failed to store bus message:" << errorText;
|
|
|
emit databaseError(errorText);
|
|
|
return;
|
|
|
}
|
|
|
@@ -617,7 +617,7 @@ void DeviceBusCore::storeBusMessage(const BusMessage &message) {
|
|
|
if (!resolvedPort.isEmpty()) {
|
|
|
// 若识别出端口,则额外写入该端口对应的转化数据表
|
|
|
if (!ensurePerPortTransformedTable(resolvedPort)) {
|
|
|
- qCritical() << "Failed to ensure transformed data table for port"
|
|
|
+ LOG_CRITICAL() << "Failed to ensure transformed data table for port"
|
|
|
<< resolvedPort;
|
|
|
} else {
|
|
|
const QString tableIdentifier =
|
|
|
@@ -684,7 +684,7 @@ void DeviceBusCore::storeBusMessage(const BusMessage &message) {
|
|
|
|
|
|
if (!transformedQuery.exec()) {
|
|
|
const QString errorText = transformedQuery.lastError().text();
|
|
|
- qCritical() << "Failed to store transformed bus data:" << errorText;
|
|
|
+ LOG_CRITICAL() << "Failed to store transformed bus data:" << errorText;
|
|
|
emit databaseError(errorText);
|
|
|
} else if (knownDevice) {
|
|
|
upsertDeviceRecord(deviceInfo, messageTime);
|
|
|
@@ -700,7 +700,7 @@ QList<QByteArray> DeviceBusCore::queryRawData(int deviceId, qint64 startTime,
|
|
|
QList<QByteArray> results;
|
|
|
|
|
|
if (!m_dbInitialized || !m_db.isValid() || !m_db.isOpen()) {
|
|
|
- qWarning() << "Database not initialized for querying raw data";
|
|
|
+ LOG_WARNING() << "Database not initialized for querying raw data";
|
|
|
return results;
|
|
|
}
|
|
|
|
|
|
@@ -718,7 +718,7 @@ QList<QByteArray> DeviceBusCore::queryRawData(int deviceId, qint64 startTime,
|
|
|
|
|
|
// 查询前确保端口数据表存在
|
|
|
if (!ensurePerPortRawTable(portName)) {
|
|
|
- qCritical() << "Failed to ensure raw data table when querying port"
|
|
|
+ LOG_CRITICAL() << "Failed to ensure raw data table when querying port"
|
|
|
<< portName;
|
|
|
return results;
|
|
|
}
|
|
|
@@ -747,7 +747,7 @@ QList<QByteArray> DeviceBusCore::queryRawData(int deviceId, qint64 startTime,
|
|
|
|
|
|
if (!query.exec()) {
|
|
|
const QString errorText = query.lastError().text();
|
|
|
- qCritical() << "Failed to query raw data:" << errorText;
|
|
|
+ LOG_CRITICAL() << "Failed to query raw data:" << errorText;
|
|
|
emit databaseError(errorText);
|
|
|
return results;
|
|
|
}
|
|
|
@@ -766,7 +766,7 @@ QList<BusMessage> DeviceBusCore::queryBusMessages(const QString &source,
|
|
|
QList<BusMessage> results;
|
|
|
|
|
|
if (!m_dbInitialized || !m_db.isValid() || !m_db.isOpen()) {
|
|
|
- qWarning() << "Database not initialized for querying bus messages";
|
|
|
+ LOG_WARNING() << "Database not initialized for querying bus messages";
|
|
|
return results;
|
|
|
}
|
|
|
|
|
|
@@ -800,7 +800,7 @@ QList<BusMessage> DeviceBusCore::queryBusMessages(const QString &source,
|
|
|
|
|
|
if (!query.exec()) {
|
|
|
const QString errorText = query.lastError().text();
|
|
|
- qCritical() << "Failed to query bus messages:" << errorText;
|
|
|
+ LOG_CRITICAL() << "Failed to query bus messages:" << errorText;
|
|
|
emit databaseError(errorText);
|
|
|
return results;
|
|
|
}
|
|
|
@@ -818,7 +818,7 @@ QList<BusMessage> DeviceBusCore::queryBusMessages(const QString &source,
|
|
|
if (doc.isObject()) {
|
|
|
message.payload = doc.object();
|
|
|
} else {
|
|
|
- qWarning() << "Invalid payload JSON for message" << message.id;
|
|
|
+ LOG_WARNING() << "Invalid payload JSON for message" << message.id;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -853,7 +853,7 @@ bool DeviceBusCore::ensureRawTable() {
|
|
|
")");
|
|
|
|
|
|
if (!query.exec(createTemplateSql)) {
|
|
|
- qCritical() << "Failed to create raw_data_template table:"
|
|
|
+ LOG_CRITICAL() << "Failed to create raw_data_template table:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -868,7 +868,7 @@ bool DeviceBusCore::ensureRawTable() {
|
|
|
")");
|
|
|
|
|
|
if (!query.exec(createRegistrySql)) {
|
|
|
- qCritical() << "Failed to create raw_data_registry table:"
|
|
|
+ LOG_CRITICAL() << "Failed to create raw_data_registry table:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -876,7 +876,7 @@ bool DeviceBusCore::ensureRawTable() {
|
|
|
if (!query.exec(QStringLiteral(
|
|
|
"CREATE INDEX IF NOT EXISTS idx_raw_data_registry_table "
|
|
|
"ON raw_data_registry (table_name)"))) {
|
|
|
- qCritical() << "Failed to create raw_data_registry index:"
|
|
|
+ LOG_CRITICAL() << "Failed to create raw_data_registry index:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -903,7 +903,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
")");
|
|
|
|
|
|
if (!query.exec(createTableSql)) {
|
|
|
- qCritical() << "Failed to create bus_messages table:"
|
|
|
+ LOG_CRITICAL() << "Failed to create bus_messages table:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -911,7 +911,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
// 兼容已有实例:确保扩展列存在
|
|
|
if (!query.exec(QStringLiteral("ALTER TABLE bus_messages ADD COLUMN IF NOT "
|
|
|
"EXISTS metadata JSONB"))) {
|
|
|
- qCritical() << "Failed to ensure bus_messages metadata column:"
|
|
|
+ LOG_CRITICAL() << "Failed to ensure bus_messages metadata column:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -919,7 +919,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
if (!query.exec(
|
|
|
QStringLiteral("ALTER TABLE bus_messages ADD COLUMN IF NOT EXISTS "
|
|
|
"created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()"))) {
|
|
|
- qCritical() << "Failed to ensure bus_messages created_at column:"
|
|
|
+ LOG_CRITICAL() << "Failed to ensure bus_messages created_at column:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -927,7 +927,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
if (!query.exec(QStringLiteral(
|
|
|
"CREATE INDEX IF NOT EXISTS idx_bus_messages_source_dest_ts "
|
|
|
"ON bus_messages (source, destination, ts)"))) {
|
|
|
- qCritical() << "Failed to create bus_messages index:"
|
|
|
+ LOG_CRITICAL() << "Failed to create bus_messages index:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -935,7 +935,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
if (!query.exec(
|
|
|
QStringLiteral("CREATE INDEX IF NOT EXISTS idx_bus_messages_ts "
|
|
|
"ON bus_messages (ts)"))) {
|
|
|
- qCritical() << "Failed to create bus_messages timestamp index:"
|
|
|
+ LOG_CRITICAL() << "Failed to create bus_messages timestamp index:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -959,7 +959,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
")");
|
|
|
|
|
|
if (!query.exec(transformedTemplateSql)) {
|
|
|
- qCritical() << "Failed to create transformed_data_template table:"
|
|
|
+ LOG_CRITICAL() << "Failed to create transformed_data_template table:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -974,7 +974,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
")");
|
|
|
|
|
|
if (!query.exec(transformedRegistrySql)) {
|
|
|
- qCritical() << "Failed to create transformed_data_registry table:"
|
|
|
+ LOG_CRITICAL() << "Failed to create transformed_data_registry table:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -982,7 +982,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
if (!query.exec(QStringLiteral(
|
|
|
"CREATE INDEX IF NOT EXISTS idx_transformed_data_registry_table "
|
|
|
"ON transformed_data_registry (table_name)"))) {
|
|
|
- qCritical() << "Failed to create transformed_data_registry index:"
|
|
|
+ LOG_CRITICAL() << "Failed to create transformed_data_registry index:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1006,7 +1006,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
")");
|
|
|
|
|
|
if (!query.exec(devicesSql)) {
|
|
|
- qCritical() << "Failed to create devices table:"
|
|
|
+ LOG_CRITICAL() << "Failed to create devices table:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1016,7 +1016,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
"devices (port_name)");
|
|
|
|
|
|
if (!query.exec(devicePortIndexSql)) {
|
|
|
- qCritical() << "Failed to create devices port index:"
|
|
|
+ LOG_CRITICAL() << "Failed to create devices port index:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1037,7 +1037,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
")");
|
|
|
|
|
|
if (!query.exec(deviceParametersSql)) {
|
|
|
- qCritical() << "Failed to create device_parameters table:"
|
|
|
+ LOG_CRITICAL() << "Failed to create device_parameters table:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1045,7 +1045,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
if (!query.exec(QStringLiteral(
|
|
|
"CREATE INDEX IF NOT EXISTS idx_device_parameters_device "
|
|
|
"ON device_parameters (device_id)"))) {
|
|
|
- qCritical() << "Failed to create device_parameters index:"
|
|
|
+ LOG_CRITICAL() << "Failed to create device_parameters index:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1063,7 +1063,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
")");
|
|
|
|
|
|
if (!query.exec(systemLogsSql)) {
|
|
|
- qCritical() << "Failed to create system_logs table:"
|
|
|
+ LOG_CRITICAL() << "Failed to create system_logs table:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1071,7 +1071,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
if (!query.exec(
|
|
|
QStringLiteral("CREATE INDEX IF NOT EXISTS idx_system_logs_category "
|
|
|
"ON system_logs (category)"))) {
|
|
|
- qCritical() << "Failed to create system_logs category index:"
|
|
|
+ LOG_CRITICAL() << "Failed to create system_logs category index:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1079,7 +1079,7 @@ bool DeviceBusCore::ensureBusTable() {
|
|
|
if (!query.exec(QStringLiteral(
|
|
|
"CREATE INDEX IF NOT EXISTS idx_system_logs_created_at "
|
|
|
"ON system_logs (created_at)"))) {
|
|
|
- qCritical() << "Failed to create system_logs timestamp index:"
|
|
|
+ LOG_CRITICAL() << "Failed to create system_logs timestamp index:"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1164,7 +1164,7 @@ bool DeviceBusCore::initializeDatabase(QSqlDatabase &db,
|
|
|
const QSqlError createError = maintenanceQuery.lastError();
|
|
|
if (createError.nativeErrorCode() !=
|
|
|
QLatin1String("42P04")) { // duplicate_database
|
|
|
- qCritical() << "Failed to create database" << databaseName << ":"
|
|
|
+ LOG_CRITICAL() << "Failed to create database" << databaseName << ":"
|
|
|
<< createError.text();
|
|
|
maintenanceDb.close();
|
|
|
maintenanceDb = QSqlDatabase();
|
|
|
@@ -1174,7 +1174,7 @@ bool DeviceBusCore::initializeDatabase(QSqlDatabase &db,
|
|
|
}
|
|
|
maintenanceDb.close();
|
|
|
} else {
|
|
|
- qCritical() << "Failed to open maintenance database"
|
|
|
+ LOG_CRITICAL() << "Failed to open maintenance database"
|
|
|
<< maintenanceDbName << ":"
|
|
|
<< maintenanceDb.lastError().text();
|
|
|
maintenanceDb = QSqlDatabase();
|
|
|
@@ -1186,12 +1186,12 @@ bool DeviceBusCore::initializeDatabase(QSqlDatabase &db,
|
|
|
QSqlDatabase::removeDatabase(maintenanceConnection);
|
|
|
|
|
|
if (!db.open()) {
|
|
|
- qCritical() << "Failed to reopen PostgreSQL database" << databaseName
|
|
|
+ LOG_CRITICAL() << "Failed to reopen PostgreSQL database" << databaseName
|
|
|
<< ":" << db.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
} else {
|
|
|
- qCritical() << "Failed to open PostgreSQL database" << databaseName << ":"
|
|
|
+ LOG_CRITICAL() << "Failed to open PostgreSQL database" << databaseName << ":"
|
|
|
<< initialError.text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1214,7 +1214,7 @@ bool DeviceBusCore::ensurePerPortRawTable(const QString &portName) {
|
|
|
if (!query.exec(QStringLiteral("CREATE TABLE IF NOT EXISTS %1 (LIKE "
|
|
|
"raw_data_template INCLUDING ALL)")
|
|
|
.arg(quotedTable))) {
|
|
|
- qCritical() << "Failed to create raw data table" << tableName << ":"
|
|
|
+ LOG_CRITICAL() << "Failed to create raw data table" << tableName << ":"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1231,7 +1231,7 @@ bool DeviceBusCore::ensurePerPortRawTable(const QString &portName) {
|
|
|
QStringLiteral(
|
|
|
"CREATE INDEX IF NOT EXISTS %1 ON %2 (device_id, created_at)")
|
|
|
.arg(deviceCreatedIndex, quotedTable))) {
|
|
|
- qCritical() << "Failed to create device_created index for" << tableName
|
|
|
+ LOG_CRITICAL() << "Failed to create device_created index for" << tableName
|
|
|
<< ":" << query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1241,7 +1241,7 @@ bool DeviceBusCore::ensurePerPortRawTable(const QString &portName) {
|
|
|
if (!query.exec(
|
|
|
QStringLiteral("CREATE INDEX IF NOT EXISTS %1 ON %2 (created_at)")
|
|
|
.arg(createdIndex, quotedTable))) {
|
|
|
- qCritical() << "Failed to create created_at index for" << tableName << ":"
|
|
|
+ LOG_CRITICAL() << "Failed to create created_at index for" << tableName << ":"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1257,7 +1257,7 @@ bool DeviceBusCore::ensurePerPortRawTable(const QString &portName) {
|
|
|
registryQuery.bindValue(QStringLiteral(":table_name"), tableName);
|
|
|
|
|
|
if (!registryQuery.exec()) {
|
|
|
- qCritical() << "Failed to upsert raw_data_registry for" << portName << ":"
|
|
|
+ LOG_CRITICAL() << "Failed to upsert raw_data_registry for" << portName << ":"
|
|
|
<< registryQuery.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1279,7 +1279,7 @@ bool DeviceBusCore::ensurePerPortTransformedTable(const QString &portName) {
|
|
|
if (!query.exec(QStringLiteral("CREATE TABLE IF NOT EXISTS %1 (LIKE "
|
|
|
"transformed_data_template INCLUDING ALL)")
|
|
|
.arg(quotedTable))) {
|
|
|
- qCritical() << "Failed to create transformed data table" << tableName << ":"
|
|
|
+ LOG_CRITICAL() << "Failed to create transformed data table" << tableName << ":"
|
|
|
<< query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1295,7 +1295,7 @@ bool DeviceBusCore::ensurePerPortTransformedTable(const QString &portName) {
|
|
|
QStringLiteral(
|
|
|
"CREATE INDEX IF NOT EXISTS %1 ON %2 (device_id, created_at)")
|
|
|
.arg(deviceCreatedIndex, quotedTable))) {
|
|
|
- qCritical() << "Failed to create transformed device index for" << tableName
|
|
|
+ LOG_CRITICAL() << "Failed to create transformed device index for" << tableName
|
|
|
<< ":" << query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1305,7 +1305,7 @@ bool DeviceBusCore::ensurePerPortTransformedTable(const QString &portName) {
|
|
|
if (!query.exec(
|
|
|
QStringLiteral("CREATE INDEX IF NOT EXISTS %1 ON %2 (created_at)")
|
|
|
.arg(createdIndex, quotedTable))) {
|
|
|
- qCritical() << "Failed to create transformed created_at index for"
|
|
|
+ LOG_CRITICAL() << "Failed to create transformed created_at index for"
|
|
|
<< tableName << ":" << query.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1321,7 +1321,7 @@ bool DeviceBusCore::ensurePerPortTransformedTable(const QString &portName) {
|
|
|
registryQuery.bindValue(QStringLiteral(":table_name"), tableName);
|
|
|
|
|
|
if (!registryQuery.exec()) {
|
|
|
- qCritical() << "Failed to upsert transformed_data_registry for" << portName
|
|
|
+ LOG_CRITICAL() << "Failed to upsert transformed_data_registry for" << portName
|
|
|
<< ":" << registryQuery.lastError().text();
|
|
|
return false;
|
|
|
}
|
|
|
@@ -1383,7 +1383,7 @@ void DeviceBusCore::upsertDeviceRecord(const DeviceInfo &device,
|
|
|
|
|
|
if (!query.exec()) {
|
|
|
const QString errorText = query.lastError().text();
|
|
|
- qCritical() << "Failed to upsert device record:" << errorText;
|
|
|
+ LOG_CRITICAL() << "Failed to upsert device record:" << errorText;
|
|
|
emit databaseError(errorText);
|
|
|
}
|
|
|
}
|
|
|
@@ -1402,7 +1402,7 @@ void DeviceBusCore::markDeviceInactive(int deviceId) {
|
|
|
|
|
|
if (!query.exec()) {
|
|
|
const QString errorText = query.lastError().text();
|
|
|
- qCritical() << "Failed to mark device inactive:" << errorText;
|
|
|
+ LOG_CRITICAL() << "Failed to mark device inactive:" << errorText;
|
|
|
emit databaseError(errorText);
|
|
|
}
|
|
|
}
|