adolforeyna/tactility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced Logger usage with LOG_x (#548)

Browse Source
This commit is contained in:
Ken Van Hoeylandt
2026-07-04 23:49:19 +02:00
committed by GitHub
parent ecad2248d9
commit 9d5993930d
162 changed files with 1776 additions and 1842 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactility/Source/settings/Language.cpp
+4 -3
View File
@@ -1,12 +1,13 @@
#include <Tactility/Logger.h>
#include <Tactility/settings/Language.h>
#include <Tactility/settings/SystemSettings.h>
#include <tactility/log.h>
#include <utility>
namespace tt::settings {
static const auto LOGGER = Logger("Language");
constexpr auto* TAG = "Language";
void setLanguage(Language newLanguage) {
SystemSettings properties;
@@ -40,7 +41,7 @@ std::string toString(Language language) {
case Language::nl_NL:
return "nl-NL";
default:
LOGGER.error("Missing serialization for language {}", static_cast<int>(language));
LOG_E(TAG, "Missing serialization for language %d", static_cast<int>(language));
std::unreachable();
}
}
Tactility/Source/settings/SystemSettings.cpp
+10 -9
View File
@@ -1,4 +1,3 @@
#include <Tactility/Logger.h>
#include <Tactility/Mutex.h>
#include <Tactility/file/File.h>
#include <Tactility/file/FileLock.h>
@@ -8,11 +7,13 @@
#include "Tactility/Paths.h"
#include <tactility/log.h>
#include <format>
namespace tt::settings {
static const auto LOGGER = Logger("SystemSettings");
constexpr auto* TAG = "SystemSettings";
constexpr auto* FILE_PATH_FORMAT = "{}/settings/system.properties";
@@ -26,7 +27,7 @@ static bool hasSystemSettingsFile() {
static bool loadSystemSettingsFromFile(SystemSettings& properties) {
auto file_path = std::format(FILE_PATH_FORMAT, getUserDataPath());
LOGGER.info("System settings loading from {}", file_path);
LOG_I(TAG, "System settings loading from %s", file_path.c_str());
std::map<std::string, std::string> map;
if (!file::loadPropertiesFile(file_path, map)) {
return false;
@@ -35,7 +36,7 @@ static bool loadSystemSettingsFromFile(SystemSettings& properties) {
auto language_entry = map.find("language");
if (language_entry != map.end()) {
if (!fromString(language_entry->second, properties.language)) {
LOGGER.warn("Unknown language \"{}\" in {}", language_entry->second, file_path);
LOG_W(TAG, "Unknown language \"%s\" in %s", language_entry->second.c_str(), file_path.c_str());
properties.language = Language::en_US;
}
} else {
@@ -52,11 +53,11 @@ static bool loadSystemSettingsFromFile(SystemSettings& properties) {
if (date_format_entry != map.end() && !date_format_entry->second.empty()) {
properties.dateFormat = date_format_entry->second;
} else {
LOGGER.info("dateFormat missing or empty, using default MM/DD/YYYY (likely from older system.properties)");
LOG_I(TAG, "dateFormat missing or empty, using default MM/DD/YYYY (likely from older system.properties)");
properties.dateFormat = "MM/DD/YYYY";
}
LOGGER.info("System settings loaded");
LOG_I(TAG, "System settings loaded");
return true;
}
@@ -65,7 +66,7 @@ bool loadSystemSettings(SystemSettings& properties) {
if (loadSystemSettingsFromFile(cachedSettings)) {
cached = true;
} else {
LOGGER.error("Failed to load");
LOG_E(TAG, "Failed to load");
}
}
@@ -81,12 +82,12 @@ bool saveSystemSettings(const SystemSettings& properties) {
map["dateFormat"] = properties.dateFormat;
if (!file::findOrCreateParentDirectory(file_path, 0755)) {
LOGGER.error("Failed to create parent dir for {}", file_path);
LOG_E(TAG, "Failed to create parent dir for %s", file_path.c_str());
return false;
}
if (!file::savePropertiesFile(file_path, map)) {
LOGGER.error("Failed to save {}", file_path);
LOG_E(TAG, "Failed to save %s", file_path.c_str());
return false;
}
Tactility/Source/settings/WebServerSettings.cpp
+12 -11
View File
@@ -1,9 +1,10 @@
#include <Tactility/settings/WebServerSettings.h>
#include <Tactility/file/PropertiesFile.h>
#include <Tactility/file/File.h>
#include <Tactility/Logger.h>
#include <Tactility/Paths.h>
#include <tactility/log.h>
#include <charconv>
#include <map>
#include <string>
@@ -18,7 +19,7 @@
namespace tt::settings::webserver {
static const auto LOGGER = Logger("WebServerSettings");
constexpr auto* TAG = "WebServerSettings";
static std::string getSettingsFilePath() {
return getUserDataPath() + "/settings/webserver.properties";
@@ -147,7 +148,7 @@ bool load(WebServerSettings& settings) {
// Skip this if user explicitly wants an open network.
// Note: We only auto-generate for EMPTY passwords, not user-set ones.
if (!settings.apOpenNetwork && isEmptyCredential(settings.apPassword)) {
LOGGER.info("AP password is empty - generating secure random password");
LOG_I(TAG, "AP password is empty - generating secure random password");
// Generate 12-character random password (alphanumeric, ~71 bits of entropy)
// WPA2 requires 8-63 characters, so 12 is well within range
@@ -156,9 +157,9 @@ bool load(WebServerSettings& settings) {
// Persist the generated password immediately
map[KEY_AP_PASSWORD] = settings.apPassword;
if (file::savePropertiesFile(getSettingsFilePath(), map)) {
LOGGER.info("Generated and saved new secure AP password");
LOG_I(TAG, "Generated and saved new secure AP password");
} else {
LOGGER.error("Failed to save generated AP password");
LOG_E(TAG, "Failed to save generated AP password");
}
}
@@ -186,7 +187,7 @@ bool load(WebServerSettings& settings) {
if (settings.webServerAuthEnabled &&
(isEmptyCredential(settings.webServerUsername) || isEmptyCredential(settings.webServerPassword))) {
LOGGER.info("Auth enabled with empty credentials - generating secure random credentials");
LOG_I(TAG, "Auth enabled with empty credentials - generating secure random credentials");
// Generate 12-character random credentials (alphanumeric, ~71 bits of entropy each)
settings.webServerUsername = generateRandomCredential(12);
@@ -197,9 +198,9 @@ bool load(WebServerSettings& settings) {
map[KEY_WEBSERVER_USERNAME] = settings.webServerUsername;
map[KEY_WEBSERVER_PASSWORD] = settings.webServerPassword;
if (file::savePropertiesFile(getSettingsFilePath(), map)) {
LOGGER.info("Generated and saved new secure credentials");
LOG_I(TAG, "Generated and saved new secure credentials");
} else {
LOGGER.error("Failed to save generated credentials - auth may be inconsistent across reboots");
LOG_E(TAG, "Failed to save generated credentials - auth may be inconsistent across reboots");
}
}
@@ -231,9 +232,9 @@ WebServerSettings loadOrGetDefault() {
settings = getDefault();
// Save defaults to flash so toggle states persist
if (save(settings)) {
LOGGER.info("First boot - saved default settings (WiFi OFF WebServer OFF)");
LOG_I(TAG, "First boot - saved default settings (WiFi OFF WebServer OFF)");
} else {
LOGGER.warn("First boot - failed to save default settings to flash");
LOG_W(TAG, "First boot - failed to save default settings to flash");
}
}
@@ -264,7 +265,7 @@ bool save(const WebServerSettings& settings) {
auto settings_path = getSettingsFilePath();
if (!file::findOrCreateParentDirectory(settings_path, 0755)) {
LOGGER.error("Failed to create parent dir for {}", settings_path);
LOG_E(TAG, "Failed to create parent dir for %s", settings_path.c_str());
return false;
}
return file::savePropertiesFile(settings_path, map);