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

Merge pull request #208 from mc-server/NewWebServer

Browse Source 
New web server
This commit is contained in:
Mattes D
2013-10-07 13:19:14 -07:00
parent 68605b6dce f55b77a98a
commit e3ba3b8f97
43 changed files with 3212 additions and 2619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/Root.cpp
View File

@@ -134,17 +134,9 @@ void cRoot::Start(void)
}
IniFile.WriteFile();
cIniFile WebIniFile("webadmin.ini");
if (!WebIniFile.ReadFile())
{
LOGWARNING("webadmin.ini inaccessible, wabadmin is disabled");
}
if (WebIniFile.GetValueB("WebAdmin", "Enabled", false))
{
LOGD("Creating WebAdmin...");
m_WebAdmin = new cWebAdmin(8080);
}
LOG("Initialising WebAdmin...");
m_WebAdmin = new cWebAdmin();
m_WebAdmin->Init();
LOGD("Loading settings...");
m_GroupManager = new cGroupManager();
@@ -173,6 +165,9 @@ void cRoot::Start(void)
LOGD("Finalising startup...");
m_Server->Start();
LOG("Starting WebAdmin...");
m_WebAdmin->Start();
#if !defined(ANDROID_NDK)
LOGD("Starting InputThread...");