Core/Misc: Misc Fixes

This commit is contained in:
hondacrx
2018-05-22 00:43:21 -04:00
parent 5dacd669b5
commit 0be2dc08e2
19 changed files with 72 additions and 115 deletions
@@ -80,8 +80,6 @@ namespace Framework.Database
// Populate and update only if updates are enabled for this pool
_populate.Add(() =>
{
//Hack used to allow big querys
database.Apply("SET GLOBAL max_allowed_packet=1073741824;");
if (!database.GetUpdater().Populate())
{
Log.outError(LogFilter.ServerLoading, $"Could not populate the {database.GetDatabaseName()} database, see log for details.");
@@ -92,8 +90,6 @@ namespace Framework.Database
_update.Add(() =>
{
//Hack used to allow big querys
database.Apply("SET GLOBAL max_allowed_packet=1073741824;");
if (!database.GetUpdater().Update())
{
Log.outError(LogFilter.ServerLoading, $"Could not update the {database.GetDatabaseName()} database, see log for details.");
+1 -1
View File
@@ -35,7 +35,7 @@ namespace Framework.Database
public bool Populate()
{
SQLResult result = _database.Query("SHOW TABLES");
if (!result.IsEmpty() && result.GetRowCount() > 0)
if (!result.IsEmpty() && !result.IsEmpty())
return true;
Log.outInfo(LogFilter.SqlUpdates, $"Database {_database.GetDatabaseName()} is empty, auto populating it...");
+1 -1
View File
@@ -76,7 +76,7 @@ namespace Framework.Database
if (!hasNext)
return QueryCallbackStatus.Completed;
callback = _callbacks.Dequeue();
callback = _callbacks.Peek();
}
else
return QueryCallbackStatus.NotReady;