flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Minor startup streamlining

Browse Source 
* LOGD'd unneeded debugging messages, streamlining startup
+ Added a basic timer for how long in seconds it took to start up
+ Added two checks for plural (plugin/s, second/s)
This commit is contained in:
Tiger Wang
2013-09-28 20:36:01 +01:00
parent 21b23ff1e7
commit cc5c56d545
8 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Root.cpp
+41 -23
View File
@@ -21,6 +21,7 @@
#include "../iniFile/iniFile.h"
#include <iostream>
#include <time.h>
@@ -91,6 +92,17 @@ void cRoot::InputThread(void * a_Params)
void cRoot::Start(void)
{
time_t timer;
struct tm y2k;
double seconds;
double finishseconds;
y2k.tm_hour = 0; y2k.tm_min = 0; y2k.tm_sec = 0;
y2k.tm_year = 100; y2k.tm_mon = 0; y2k.tm_mday = 1;
time(&timer);
seconds = difftime(timer,mktime(&y2k));
cDeadlockDetect dd;
delete m_Log;
m_Log = new cMCLogger();
@@ -125,7 +137,7 @@ void cRoot::Start(void)
LOG("Starting server...");
if (!m_Server->InitServer(IniFile))
{
LOGERROR("Failed to start server, shutting down.");
LOGERROR("Failure starting server, aborting...");
return;
}
IniFile.WriteFile();
@@ -138,45 +150,51 @@ void cRoot::Start(void)
if (WebIniFile.GetValueB("WebAdmin", "Enabled", false))
{
LOG("Creating WebAdmin...");
LOGD("Creating WebAdmin...");
m_WebAdmin = new cWebAdmin(8080);
}
LOG("Loading settings...");
LOGD("Loading settings...");
m_GroupManager = new cGroupManager();
m_CraftingRecipes = new cCraftingRecipes;
m_FurnaceRecipe = new cFurnaceRecipe();
LOG("Loading worlds...");
LOGD("Loading worlds...");
LoadWorlds();
LOG("Loading plugin manager...");
LOGD("Loading plugin manager...");
m_PluginManager = new cPluginManager();
m_PluginManager->ReloadPluginsNow();
LOG("Loading MonsterConfig...");
LOGD("Loading MonsterConfig...");
m_MonsterConfig = new cMonsterConfig;
// This sets stuff in motion
LOG("Starting Authenticator...");
LOGD("Starting Authenticator...");
m_Authenticator.Start();
LOG("Starting worlds...");
LOGD("Starting worlds...");
StartWorlds();
LOG("Starting deadlock detector...");
LOGD("Starting deadlock detector...");
dd.Start();
LOG("Starting server...");
LOGD("Finalising startup...");
m_Server->Start();
#if !defined(ANDROID_NDK)
LOG("Starting InputThread...");
LOGD("Starting InputThread...");
m_InputThread = new cThread( InputThread, this, "cRoot::InputThread" );
m_InputThread->Start( false ); // We should NOT wait? Otherwise we can´t stop the server from other threads than the input thread
#endif
LOG("Initialization done, server running now.");
time(&timer);
finishseconds = difftime(timer,mktime(&y2k));
finishseconds -= seconds;
if ((finishseconds > 1) || (finishseconds == 0)) { LOG("Startup complete, took %.f seconds!", finishseconds); }
else { LOG("Startup complete, took 1 second!"); }
while (!m_bStop && !m_bRestart) // These are modified by external threads
{
cSleep::MilliSleep(1000);
@@ -190,37 +208,37 @@ void cRoot::Start(void)
LOG("Shutting down server...");
m_Server->Shutdown();
LOG("Shutting down deadlock detector...");
LOGD("Shutting down deadlock detector...");
dd.Stop();
LOG("Stopping world threads...");
LOGD("Stopping world threads...");
StopWorlds();
LOG("Stopping authenticator...");
LOGD("Stopping authenticator...");
m_Authenticator.Stop();
LOG("Freeing MonsterConfig...");
LOGD("Freeing MonsterConfig...");
delete m_MonsterConfig; m_MonsterConfig = NULL;
LOG("Stopping WebAdmin...");
LOGD("Stopping WebAdmin...");
delete m_WebAdmin; m_WebAdmin = NULL;
LOG("Unloading recipes...");
LOGD("Unloading recipes...");
delete m_FurnaceRecipe; m_FurnaceRecipe = NULL;
delete m_CraftingRecipes; m_CraftingRecipes = NULL;
LOG("Forgetting groups...");
LOGD("Forgetting groups...");
delete m_GroupManager; m_GroupManager = 0;
LOG("Unloading worlds...");
LOGD("Unloading worlds...");
UnloadWorlds();
LOG("Stopping plugin manager...");
LOGD("Stopping plugin manager...");
delete m_PluginManager; m_PluginManager = NULL;
cItemHandler::Deinit();
cBlockHandler::Deinit();
LOG("Destroying server...");
LOG("Cleaning up...");
//delete HeartBeat; HeartBeat = 0;
delete m_Server; m_Server = 0;
LOG("Shutdown done.");
LOG("Shutdown successful!");
}
delete m_Log; m_Log = 0;