Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/base/StarConfiguration.cpp5
-rw-r--r--source/base/StarConfiguration.hpp1
-rw-r--r--source/game/StarRoot.cpp2
3 files changed, 7 insertions, 1 deletions
diff --git a/source/base/StarConfiguration.cpp b/source/base/StarConfiguration.cpp
index c1529ae..81c1212 100644
--- a/source/base/StarConfiguration.cpp
+++ b/source/base/StarConfiguration.cpp
@@ -16,6 +16,11 @@ Json Configuration::currentConfiguration() const {
return m_currentConfig;
}
+String Configuration::printConfiguration() const {
+ MutexLocker locker(m_mutex);
+ return m_currentConfig.printJson(2, true);
+}
+
Json Configuration::get(String const& key) const {
MutexLocker locker(m_mutex);
return m_currentConfig.get(key, {});
diff --git a/source/base/StarConfiguration.hpp b/source/base/StarConfiguration.hpp
index 53e0e7b..7e200c0 100644
--- a/source/base/StarConfiguration.hpp
+++ b/source/base/StarConfiguration.hpp
@@ -17,6 +17,7 @@ public:
Json defaultConfiguration() const;
Json currentConfiguration() const;
+ String printConfiguration() const;
Json get(String const& key) const;
Json getPath(String const& path) const;
diff --git a/source/game/StarRoot.cpp b/source/game/StarRoot.cpp
index 78d46c6..df2fc98 100644
--- a/source/game/StarRoot.cpp
+++ b/source/game/StarRoot.cpp
@@ -678,7 +678,7 @@ void Root::writeConfig() {
if (m_lastRuntimeConfig != currentConfig) {
if (m_runtimeConfigFile) {
Logger::info("Root: Writing runtime configuration to '{}'", *m_runtimeConfigFile);
- File::overwriteFileWithRename(currentConfig.printJson(2, true), *m_runtimeConfigFile);
+ File::overwriteFileWithRename(m_configuration->printConfiguration(), *m_runtimeConfigFile);
}
m_lastRuntimeConfig = currentConfig;
}