Server::step throw is never catched. Replace it with an errorstream + assert

nerzhul · nerzhul · commit 5f8e48c63baf · 2015-03-16T20:25:35.000+01:00
This throw can be trigger by LuaError exception or ConnectionBindFailed exception in the following functions:
* EmergeThread::Thread()
* ScriptApiEnv::environment_Step()
* ScriptApiEnv::player_event()
* ServerThread::Thread()
diff --git a/src/server.cpp b/src/server.cpp
@@ -479,10 +479,13 @@ void Server::step(float dtime)
 		JMutexAutoLock lock(m_step_dtime_mutex);
 		m_step_dtime += dtime;
 	}
-	// Throw if fatal error occurred in thread
+	// Assert if fatal error occurred in thread
 	std::string async_err = m_async_fatal_error.get();
-	if(async_err != ""){
-		throw ServerError(async_err);
+	if(async_err != "") {
+		errorstream << "UNRECOVERABLE error occurred. Stopping server. "
+				<< "Please fix the following error:" << std::endl
+				<< async_err << std::endl;
+		assert(false);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -479,10 +479,13 @@ void Server::step(float dtime)`
`479`	`479`	`JMutexAutoLock lock(m_step_dtime_mutex);`
`480`	`480`	`m_step_dtime += dtime;`
`481`	`481`	`}`
`482`		`- // Throw if fatal error occurred in thread`
	`482`	`+ // Assert if fatal error occurred in thread`
`483`	`483`	`std::string async_err = m_async_fatal_error.get();`
`484`		`- if(async_err != ""){`
`485`		`- throw ServerError(async_err);`
	`484`	`+ if(async_err != "") {`
	`485`	`+ errorstream << "UNRECOVERABLE error occurred. Stopping server. "`
	`486`	`+ << "Please fix the following error:" << std::endl`
	`487`	`+ << async_err << std::endl;`
	`488`	`+ assert(false);`
`486`	`489`	`}`
`487`	`490`	`}`
`488`	`491`