From b540c426c1db21a8874a524039098028b498b06f Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Tue, 1 Nov 2022 17:06:33 +0100 Subject: [PATCH] Use logging categories --- interface/src/Application.h | 2 +- libraries/shared/src/SettingHandle.cpp | 1 + libraries/shared/src/SettingHandle.h | 5 ++++- libraries/shared/src/SettingInterface.cpp | 6 ++++-- libraries/shared/src/SettingInterface.h | 7 +++++-- libraries/shared/src/SettingManager.cpp | 5 +++-- libraries/shared/src/SettingManager.h | 3 +++ 7 files changed, 21 insertions(+), 8 deletions(-) diff --git a/interface/src/Application.h b/interface/src/Application.h index df79d2255f..ce200ce8bc 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -481,7 +481,7 @@ public slots: void setIsInterstitialMode(bool interstitialMode); void updateVerboseLogging(); - + void setCachebustRequire(); void changeViewAsNeeded(float boomLength); diff --git a/libraries/shared/src/SettingHandle.cpp b/libraries/shared/src/SettingHandle.cpp index 25a8cca98e..f5c6fc3696 100644 --- a/libraries/shared/src/SettingHandle.cpp +++ b/libraries/shared/src/SettingHandle.cpp @@ -15,6 +15,7 @@ #include +Q_LOGGING_CATEGORY(settings_handle, "settings.handle") const QString Settings::firstRun { "firstRun" }; diff --git a/libraries/shared/src/SettingHandle.h b/libraries/shared/src/SettingHandle.h index 0bddf5b4da..7f5b544868 100644 --- a/libraries/shared/src/SettingHandle.h +++ b/libraries/shared/src/SettingHandle.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -27,6 +28,8 @@ #include "SettingInterface.h" +Q_DECLARE_LOGGING_CATEGORY(settings_handle) + /** * @brief QSettings analog * @@ -309,7 +312,7 @@ namespace Setting { void deprecate() { if (_isSet) { if (get() != getDefault()) { - qInfo().nospace() << "[DEPRECATION NOTICE] " << _key << "(" << get() << ") has been deprecated, and has no effect"; + qCInfo(settings_handle).nospace() << "[DEPRECATION NOTICE] " << _key << "(" << get() << ") has been deprecated, and has no effect"; } else { remove(); } diff --git a/libraries/shared/src/SettingInterface.cpp b/libraries/shared/src/SettingInterface.cpp index 6c1e61e2a5..9f4c8fd60d 100644 --- a/libraries/shared/src/SettingInterface.cpp +++ b/libraries/shared/src/SettingInterface.cpp @@ -74,7 +74,7 @@ namespace Setting { // in an assignment-client - the QSettings backing we use for this means persistence of these // settings from an AC (when there can be multiple terminating at same time on one machine) // is currently not supported - qWarning() << "Setting::Interface::init() for key" << _key << "- Manager not yet created." << + qCWarning(settings_interface) << "Setting::Interface::init() for key" << _key << "- Manager not yet created." << "Settings persistence disabled."; } else { _manager = DependencyManager::get(); @@ -84,11 +84,12 @@ namespace Setting { manager->registerHandle(this); _isInitialized = true; } else { - qWarning() << "Settings interface used after manager destroyed"; + qCWarning(settings_interface) << "Settings interface used after manager destroyed"; } // Load value from disk load(); + //qCDebug(settings_interface) << "Setting" << this->getKey() << "initialized to" << getVariant(); } } @@ -106,6 +107,7 @@ namespace Setting { void Interface::maybeInit() const { if (!_isInitialized) { + //qCDebug(settings_interface) << "Initializing setting" << this->getKey(); const_cast(this)->init(); } } diff --git a/libraries/shared/src/SettingInterface.h b/libraries/shared/src/SettingInterface.h index 575641c0e7..fa30b24e08 100644 --- a/libraries/shared/src/SettingInterface.h +++ b/libraries/shared/src/SettingInterface.h @@ -16,6 +16,9 @@ #include #include #include +#include + +Q_DECLARE_LOGGING_CATEGORY(settings_interface) namespace Setting { class Manager; @@ -37,7 +40,7 @@ namespace Setting { void init(); void maybeInit() const; void deinit(); - + void save(); void load(); @@ -46,7 +49,7 @@ namespace Setting { private: mutable bool _isInitialized = false; - + friend class Manager; mutable QWeakPointer _manager; }; diff --git a/libraries/shared/src/SettingManager.cpp b/libraries/shared/src/SettingManager.cpp index d32b9b2944..7bbfe96e8b 100644 --- a/libraries/shared/src/SettingManager.cpp +++ b/libraries/shared/src/SettingManager.cpp @@ -65,7 +65,7 @@ namespace Setting { _fileName = settings.fileName(); for(QString key : settings.allKeys()) { - qDebug() << "Loaded key" << key << "with value" << settings.value(key); + //qCDebug(settings_manager) << "Loaded key" << key << "with value" << settings.value(key); _settings[key] = settings.value(key); } } @@ -82,7 +82,7 @@ namespace Setting { const QString& key = handle->getKey(); withWriteLock([&] { if (_handles.contains(key)) { - qWarning() << "Setting::Manager::registerHandle(): Key registered more than once, overriding: " << key; + qCWarning(settings_manager) << "Setting::Manager::registerHandle(): Key registered more than once, overriding: " << key; } _handles.insert(key, handle); }); @@ -96,6 +96,7 @@ namespace Setting { void Manager::loadSetting(Interface* handle) { const auto& key = handle->getKey(); + withWriteLock([&] { QVariant loadedValue = _settings[key]; diff --git a/libraries/shared/src/SettingManager.h b/libraries/shared/src/SettingManager.h index f62164db0e..2b62842028 100644 --- a/libraries/shared/src/SettingManager.h +++ b/libraries/shared/src/SettingManager.h @@ -19,10 +19,13 @@ #include #include +#include #include "DependencyManager.h" #include "shared/ReadWriteLockable.h" +Q_DECLARE_LOGGING_CATEGORY(settings_manager) +Q_DECLARE_LOGGING_CATEGORY(settings_writer) // This is for the testing system. class SettingsTests;