From 5f207c8bb799dc5619586c2e885f7a692a97d915 Mon Sep 17 00:00:00 2001 From: worktycho Date: Mon, 8 Sep 2014 14:57:58 +0100 Subject: If server fails init, save any changed or generated settings. --- src/Root.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Root.cpp') diff --git a/src/Root.cpp b/src/Root.cpp index f04cbf08b..a2fbda812 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -151,6 +151,7 @@ void cRoot::Start(void) m_MojangAPI.Start(IniFile); // Mojang API needs to be started before plugins, so that plugins may use it for DB upgrades on server init if (!m_Server->InitServer(IniFile)) { + IniFile.WriteFile("Settings.ini") LOGERROR("Failure starting server, aborting..."); return; } -- cgit v1.2.3 From 4613fabd45e61700271d3dba186cb6564e07284b Mon Sep 17 00:00:00 2001 From: worktycho Date: Mon, 8 Sep 2014 15:15:31 +0100 Subject: derp --- src/Root.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Root.cpp') diff --git a/src/Root.cpp b/src/Root.cpp index a2fbda812..8e88ba1af 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -151,7 +151,7 @@ void cRoot::Start(void) m_MojangAPI.Start(IniFile); // Mojang API needs to be started before plugins, so that plugins may use it for DB upgrades on server init if (!m_Server->InitServer(IniFile)) { - IniFile.WriteFile("Settings.ini") + IniFile.WriteFile("Settings.ini"); LOGERROR("Failure starting server, aborting..."); return; } -- cgit v1.2.3 From 64071aeda9d31dfc89c3bf365d541d5968ece9da Mon Sep 17 00:00:00 2001 From: worktycho Date: Mon, 8 Sep 2014 17:45:23 +0100 Subject: capitalisation error --- src/Root.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Root.cpp') diff --git a/src/Root.cpp b/src/Root.cpp index 8e88ba1af..870662f36 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -151,7 +151,7 @@ void cRoot::Start(void) m_MojangAPI.Start(IniFile); // Mojang API needs to be started before plugins, so that plugins may use it for DB upgrades on server init if (!m_Server->InitServer(IniFile)) { - IniFile.WriteFile("Settings.ini"); + IniFile.WriteFile("settings.ini"); LOGERROR("Failure starting server, aborting..."); return; } -- cgit v1.2.3 From 27be1799392e89b2b67121ea6febd51c2b9ec4fb Mon Sep 17 00:00:00 2001 From: Tycho Date: Wed, 10 Sep 2014 16:07:00 +0100 Subject: Added abilty to set build info build info is displayed at startup Fixes #1410 --- src/Root.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/Root.cpp') diff --git a/src/Root.cpp b/src/Root.cpp index 870662f36..86a497a76 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -18,6 +18,7 @@ #include "DeadlockDetect.h" #include "OSSupport/Timer.h" #include "LoggerListeners.h" +#include "BuildInfo.h" #include "inifile/iniFile.h" @@ -111,6 +112,11 @@ void cRoot::Start(void) LOG("--- Started Log ---\n"); + #ifdef BUILD_ID + LOG("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID ); + LOG("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME ); + #endif + cDeadlockDetect dd; m_bStop = false; -- cgit v1.2.3 From 95af3eb526dc8d3289d6b1ced6462283a6ebb6b3 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Wed, 17 Sep 2014 23:32:14 +0200 Subject: Fixed minor style issues. --- src/Root.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Root.cpp') diff --git a/src/Root.cpp b/src/Root.cpp index 86a497a76..966a9b4ba 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -113,8 +113,8 @@ void cRoot::Start(void) LOG("--- Started Log ---\n"); #ifdef BUILD_ID - LOG("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID ); - LOG("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME ); + LOG("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID); + LOG("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME); #endif cDeadlockDetect dd; -- cgit v1.2.3