-
Notifications
You must be signed in to change notification settings - Fork 73
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: add log rules configuration and improve logging system (#392)
- Add log_rules configuration in org.deepin.terminal.json - Add QLoggingCategory for better log categorization - Update logging messages to use qCInfo/qCWarning/qCDebug - Add DConfig support for log rules management Log: add log rules configuration and improve logging system
- Loading branch information
Showing
1 changed file
with
174 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,174 @@ | ||
// SPDX-FileCopyrightText: 2024 - 2025 UnionTech Software Technology Co., Ltd. | ||
// | ||
// SPDX-License-Identifier: GPL-3.0-or-later | ||
|
||
#ifndef ORG_DEEPIN_TERMINAL_H | ||
#define ORG_DEEPIN_TERMINAL_H | ||
|
||
#include <QThread> | ||
#include <QVariant> | ||
#include <QDebug> | ||
#include <QAtomicPointer> | ||
#include <QAtomicInteger> | ||
#include <DConfig> | ||
|
||
class org_deepin_terminal : public QObject { | ||
Q_OBJECT | ||
|
||
Q_PROPERTY(QString log_rules READ log_rules WRITE setLog_rules NOTIFY log_rulesChanged) | ||
public: | ||
explicit org_deepin_terminal(QThread *thread, const QString &appId, const QString &name, const QString &subpath, QObject *parent = nullptr) | ||
: QObject(parent) { | ||
|
||
if (!thread->isRunning()) { | ||
qWarning() << QStringLiteral("Warning: The provided thread is not running."); | ||
} | ||
Q_ASSERT(QThread::currentThread() != thread); | ||
auto worker = new QObject(); | ||
worker->moveToThread(thread); | ||
QMetaObject::invokeMethod(worker, [=]() { | ||
auto config = DTK_CORE_NAMESPACE::DConfig::create(appId, name, subpath, nullptr); | ||
if (!config) { | ||
qWarning() << QStringLiteral("Failed to create DConfig instance."); | ||
worker->deleteLater(); | ||
return; | ||
} | ||
config->moveToThread(QThread::currentThread()); | ||
initialize(config); | ||
worker->deleteLater(); | ||
}); | ||
} | ||
explicit org_deepin_terminal(QThread *thread, DTK_CORE_NAMESPACE::DConfigBackend *backend, const QString &appId, const QString &name, const QString &subpath, QObject *parent = nullptr) | ||
: QObject(parent) { | ||
|
||
if (!thread->isRunning()) { | ||
qWarning() << QStringLiteral("Warning: The provided thread is not running."); | ||
} | ||
Q_ASSERT(QThread::currentThread() != thread); | ||
auto worker = new QObject(); | ||
worker->moveToThread(thread); | ||
QMetaObject::invokeMethod(worker, [=]() { | ||
auto config = DTK_CORE_NAMESPACE::DConfig::create(backend, appId, name, subpath, nullptr); | ||
if (!config) { | ||
qWarning() << QStringLiteral("Failed to create DConfig instance."); | ||
worker->deleteLater(); | ||
return; | ||
} | ||
config->moveToThread(QThread::currentThread()); | ||
initialize(config); | ||
worker->deleteLater(); | ||
}); | ||
} | ||
explicit org_deepin_terminal(QThread *thread, const QString &name, const QString &subpath, QObject *parent = nullptr) | ||
: QObject(parent) { | ||
|
||
if (!thread->isRunning()) { | ||
qWarning() << QStringLiteral("Warning: The provided thread is not running."); | ||
} | ||
Q_ASSERT(QThread::currentThread() != thread); | ||
auto worker = new QObject(); | ||
worker->moveToThread(thread); | ||
QMetaObject::invokeMethod(worker, [=]() { | ||
auto config = DTK_CORE_NAMESPACE::DConfig::create(name, subpath, nullptr); | ||
if (!config) { | ||
qWarning() << QStringLiteral("Failed to create DConfig instance."); | ||
worker->deleteLater(); | ||
return; | ||
} | ||
config->moveToThread(QThread::currentThread()); | ||
initialize(config); | ||
worker->deleteLater(); | ||
}); | ||
} | ||
explicit org_deepin_terminal(QThread *thread, DTK_CORE_NAMESPACE::DConfigBackend *backend, const QString &name, const QString &subpath, QObject *parent = nullptr) | ||
: QObject(parent) { | ||
|
||
if (!thread->isRunning()) { | ||
qWarning() << QStringLiteral("Warning: The provided thread is not running."); | ||
} | ||
Q_ASSERT(QThread::currentThread() != thread); | ||
auto worker = new QObject(); | ||
worker->moveToThread(thread); | ||
QMetaObject::invokeMethod(worker, [=]() { | ||
auto config = DTK_CORE_NAMESPACE::DConfig::create(backend, name, subpath, nullptr); | ||
if (!config) { | ||
qWarning() << QStringLiteral("Failed to create DConfig instance."); | ||
worker->deleteLater(); | ||
return; | ||
} | ||
config->moveToThread(QThread::currentThread()); | ||
initialize(config); | ||
worker->deleteLater(); | ||
}); | ||
} | ||
~org_deepin_terminal() { | ||
if (m_config.loadRelaxed()) { | ||
m_config.loadRelaxed()->deleteLater(); | ||
} | ||
} | ||
|
||
QString log_rules() const { | ||
return p_log_rules; | ||
} | ||
void setLog_rules(const QString &value) { | ||
auto oldValue = p_log_rules; | ||
p_log_rules = value; | ||
markPropertySet(0); | ||
if (auto config = m_config.loadRelaxed()) { | ||
QMetaObject::invokeMethod(config, [this, value]() { | ||
m_config.loadRelaxed()->setValue(QStringLiteral("log_rules"), value); | ||
}); | ||
} | ||
if (p_log_rules != oldValue) { | ||
Q_EMIT log_rulesChanged(); | ||
} | ||
} | ||
Q_SIGNALS: | ||
void log_rulesChanged(); | ||
private: | ||
void initialize(DTK_CORE_NAMESPACE::DConfig *config) { | ||
Q_ASSERT(!m_config.loadRelaxed()); | ||
m_config.storeRelaxed(config); | ||
if (testPropertySet(0)) { | ||
config->setValue(QStringLiteral("log_rules"), QVariant::fromValue(p_log_rules)); | ||
} else { | ||
updateValue(QStringLiteral("log_rules"), QVariant::fromValue(p_log_rules)); | ||
} | ||
|
||
connect(config, &DTK_CORE_NAMESPACE::DConfig::valueChanged, this, [this](const QString &key) { | ||
updateValue(key); | ||
}, Qt::DirectConnection); | ||
} | ||
void updateValue(const QString &key, const QVariant &fallback = QVariant()) { | ||
Q_ASSERT(QThread::currentThread() == m_config.loadRelaxed()->thread()); | ||
const QVariant &value = m_config.loadRelaxed()->value(key, fallback); | ||
if (key == QStringLiteral("log_rules")) { | ||
auto newValue = qvariant_cast<QString>(value); | ||
QMetaObject::invokeMethod(this, [this, newValue]() { | ||
if (p_log_rules != newValue) { | ||
p_log_rules = newValue; | ||
Q_EMIT log_rulesChanged(); | ||
} | ||
}); | ||
return; | ||
} | ||
} | ||
inline void markPropertySet(const int index) { | ||
if (index < 32) { | ||
m_propertySetStatus0.fetchAndOrOrdered(1 << (index - 0)); | ||
return; | ||
} | ||
Q_UNREACHABLE(); | ||
} | ||
inline bool testPropertySet(const int index) const { | ||
if (index < 32) { | ||
return (m_propertySetStatus0.loadRelaxed() & (1 << (index - 0))); | ||
} | ||
Q_UNREACHABLE(); | ||
} | ||
QAtomicPointer<DTK_CORE_NAMESPACE::DConfig> m_config = nullptr; | ||
QString p_log_rules { QStringLiteral("*terminal*.debug=false;*terminal*.info=false;*terminal*.warning=true") }; | ||
QAtomicInteger<quint32> m_propertySetStatus0 = 0; | ||
}; | ||
|
||
#endif // ORG_DEEPIN_TERMINAL_H |