forked from MagicBane/Server
Popstring to trywithresources
This commit is contained in:
@@ -355,7 +355,7 @@ public class Database {
|
|||||||
return discordAccounts;
|
return discordAccounts;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPopulationSTring() {
|
public String getPopulationString() {
|
||||||
|
|
||||||
String popString = "";
|
String popString = "";
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ public class StatusRequestHandler {
|
|||||||
outString += "OFFLINE\n";
|
outString += "OFFLINE\n";
|
||||||
|
|
||||||
if (Database.online == true)
|
if (Database.online == true)
|
||||||
outString += MagicBot.database.getPopulationSTring();
|
outString += MagicBot.database.getPopulationString();
|
||||||
else
|
else
|
||||||
outString += "Database offline: no population data.";
|
outString += "Database offline: no population data.";
|
||||||
|
|
||||||
|
|||||||
@@ -36,27 +36,6 @@ public class dbCSSessionHandler extends dbHandlerBase {
|
|||||||
setString(5, machineID);
|
setString(5, machineID);
|
||||||
return (executeUpdate() != 0);
|
return (executeUpdate() != 0);
|
||||||
}
|
}
|
||||||
// This method returns population metrics from the database
|
|
||||||
|
|
||||||
public String GET_POPULATION_STRING() {
|
|
||||||
|
|
||||||
String outString = null;
|
|
||||||
|
|
||||||
// Set up call to stored procedure
|
|
||||||
prepareCallable("CALL GET_POPULATION_STRING()");
|
|
||||||
|
|
||||||
try {
|
|
||||||
|
|
||||||
// Evaluate database ordinal and return enum
|
|
||||||
outString = getString("popstring");
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
|
||||||
Logger.error( "Failure in stored procedure:" + e.getMessage());
|
|
||||||
} finally {
|
|
||||||
closeCallable();
|
|
||||||
}
|
|
||||||
return outString;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean DELETE_UNUSED_CSSESSION(String secKey) {
|
public boolean DELETE_UNUSED_CSSESSION(String secKey) {
|
||||||
prepareCallable("DELETE FROM `dyn_session` WHERE `secretKey`=? && `characterID` IS NULL");
|
prepareCallable("DELETE FROM `dyn_session` WHERE `secretKey`=? && `characterID` IS NULL");
|
||||||
|
|||||||
@@ -10,12 +10,17 @@ package engine.gameManager;
|
|||||||
|
|
||||||
import engine.Enum;
|
import engine.Enum;
|
||||||
import engine.Enum.GameObjectType;
|
import engine.Enum.GameObjectType;
|
||||||
|
import engine.db.archive.DataWarehouse;
|
||||||
import engine.objects.AbstractGameObject;
|
import engine.objects.AbstractGameObject;
|
||||||
import engine.objects.City;
|
import engine.objects.City;
|
||||||
import engine.objects.PlayerCharacter;
|
import engine.objects.PlayerCharacter;
|
||||||
import engine.objects.Runegate;
|
import engine.objects.Runegate;
|
||||||
import org.pmw.tinylog.Logger;
|
import org.pmw.tinylog.Logger;
|
||||||
|
|
||||||
|
import java.sql.Connection;
|
||||||
|
import java.sql.PreparedStatement;
|
||||||
|
import java.sql.ResultSet;
|
||||||
|
import java.sql.SQLException;
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@@ -50,11 +55,22 @@ public enum SimulationManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String getPopulationString() {
|
public static String getPopulationString() {
|
||||||
String outString;
|
|
||||||
String newLine = System.getProperty("line.separator");
|
String popString = "";
|
||||||
outString = "[LUA_POPULATION()]" + newLine;
|
|
||||||
outString += DbManager.CSSessionQueries.GET_POPULATION_STRING();
|
try (Connection connection = DataWarehouse.connectionPool.getConnection();
|
||||||
return outString;
|
PreparedStatement getPopString = connection.prepareStatement("CALL GET_POPULATION_STRING()");) {
|
||||||
|
|
||||||
|
ResultSet rs = getPopString.executeQuery();
|
||||||
|
|
||||||
|
if (rs.next())
|
||||||
|
popString = rs.getString("popstring");
|
||||||
|
|
||||||
|
} catch (SQLException e) {
|
||||||
|
Logger.error(e.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
return popString;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user