From 699f60d399d9c0af170d7d90bd3c6ab8056ff7f0 Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Sun, 18 May 2025 00:13:46 -0500
Subject: [PATCH 1/2] Add build number to log and about dialog

---
 scwx-qt/source/scwx/qt/main/main.cpp        |  3 ++-
 scwx-qt/source/scwx/qt/main/versions.hpp.in | 11 +++--------
 scwx-qt/source/scwx/qt/ui/about_dialog.cpp  |  4 +++-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/scwx-qt/source/scwx/qt/main/main.cpp b/scwx-qt/source/scwx/qt/main/main.cpp
index 65d7e998..904ff3b3 100644
--- a/scwx-qt/source/scwx/qt/main/main.cpp
+++ b/scwx-qt/source/scwx/qt/main/main.cpp
@@ -55,8 +55,9 @@ int main(int argc, char* argv[])
    auto& logManager = scwx::qt::manager::LogManager::Instance();
    logManager.Initialize();
 
-   logger_->info("Supercell Wx v{} ({})",
+   logger_->info("Supercell Wx v{}.{} ({})",
                  scwx::qt::main::kVersionString_,
+                 scwx::qt::main::kBuildNumber_,
                  scwx::qt::main::kCommitString_);
 
    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
diff --git a/scwx-qt/source/scwx/qt/main/versions.hpp.in b/scwx-qt/source/scwx/qt/main/versions.hpp.in
index 32a69c59..bdf9cd62 100644
--- a/scwx-qt/source/scwx/qt/main/versions.hpp.in
+++ b/scwx-qt/source/scwx/qt/main/versions.hpp.in
@@ -3,17 +3,12 @@
 #include <cstdint>
 #include <string>
 
-namespace scwx
-{
-namespace qt
-{
-namespace main
+namespace scwx::qt::main
 {
 
+const std::uint32_t kBuildNumber_ {${build_number}u};
 const std::string   kCommitString_ {"${commit_string}"};
 const std::uint16_t kCopyrightYear_ {${copyright_year}u};
 const std::string   kVersionString_ {"${version_string}"};
 
-} // namespace main
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::main
diff --git a/scwx-qt/source/scwx/qt/ui/about_dialog.cpp b/scwx-qt/source/scwx/qt/ui/about_dialog.cpp
index 42ec4e32..bc24d056 100644
--- a/scwx-qt/source/scwx/qt/ui/about_dialog.cpp
+++ b/scwx-qt/source/scwx/qt/ui/about_dialog.cpp
@@ -45,7 +45,9 @@ AboutDialog::AboutDialog(QWidget* parent) :
    }
 
    ui->versionLabel->setText(
-      tr("Version %1").arg(QString::fromStdString(main::kVersionString_)));
+      tr("Version %1 (Build %2)")
+         .arg(QString::fromStdString(main::kVersionString_))
+         .arg(main::kBuildNumber_));
    ui->revisionLabel->setText(
       tr("Git Revision <a href=\"%1\">%2</a>")
          .arg(repositoryUrl)

From 9d6a0358d08171a9ec03baa907ad71fc288ab249 Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Sun, 18 May 2025 00:25:41 -0500
Subject: [PATCH 2/2] Flush logs every 3 seconds or on logging info or higher

---
 wxdata/source/scwx/util/logger.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/wxdata/source/scwx/util/logger.cpp b/wxdata/source/scwx/util/logger.cpp
index 8a97d80e..407ce354 100644
--- a/wxdata/source/scwx/util/logger.cpp
+++ b/wxdata/source/scwx/util/logger.cpp
@@ -20,6 +20,12 @@ static std::vector<std::shared_ptr<spdlog::sinks::sink>> extraSinks_ {};
 void Initialize()
 {
    spdlog::set_pattern(logPattern_);
+
+   // Periodically flush every 3 seconds
+   spdlog::flush_every(std::chrono::seconds(3));
+
+   // Flush whenever logging info or higher
+   spdlog::flush_on(spdlog::level::level_enum::info);
 }
 
 void AddFileSink(const std::string& baseFilename)