Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-28 12:07:35 +01:00
Code Issues Projects Releases Wiki Activity

Fixed Network Settings transfer. (Fixed TransferTable clean method)

Browse Source
This commit is contained in:
Rsl1122 2018-02-10 21:04:52 +02:00
parent dc7cc2daff
commit 2b7f194d37
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/TransferTable.java
View File

@ -85,13 +85,13 @@ public class TransferTable extends Table {
execute(new ExecStatement(sql) { execute(new ExecStatement(sql) {
@Override @Override
public void prepare(PreparedStatement statement) throws SQLException { public void prepare(PreparedStatement statement) throws SQLException {
statement.setLong(1, MiscUtils.getTime() + TimeAmount.MINUTE.ms()); statement.setLong(1, MiscUtils.getTime());
statement.setString(2, "onlineStatus"); statement.setString(2, "onlineStatus");
} }
}); });
sql = "DELETE FROM " + tableName + sql = "DELETE FROM " + tableName +
" WHERE " + columnSenderID + " = " + serverTable.statementSelectServerID + " WHERE " + columnSenderID + " = " + serverTable.statementSelectServerID +
" AND " + columnInfoType + " != ?"; " AND " + columnInfoType + " = ?";
execute(new ExecStatement(sql) { execute(new ExecStatement(sql) {
@Override @Override

12
Plan/src/main/java/com/djrapitops/plan/system/settings/network/NetworkSettings.java
View File

@ -54,8 +54,6 @@ public class NetworkSettings {
return; return;
} }
Log.debug("Saving Config settings to database.");
Processor.queue(() -> { Processor.queue(() -> {
try { try {
new NetworkSettings().placeToDatabase(); new NetworkSettings().placeToDatabase();
@ -66,22 +64,25 @@ public class NetworkSettings {
} }
public void loadFromDatabase() throws DBException, UnsupportedTransferDatabaseException { public void loadFromDatabase() throws DBException, UnsupportedTransferDatabaseException {
Log.debug("NetworkSettings: Fetch Config settings from database..");
Optional<String> encodedConfigSettings = Database.getActive().transfer().getEncodedConfigSettings(); Optional<String> encodedConfigSettings = Database.getActive().transfer().getEncodedConfigSettings();
if (!encodedConfigSettings.isPresent()) { if (!encodedConfigSettings.isPresent()) {
Log.debug("No Config settings in database."); Log.debug("NetworkSettings: No Config settings in database.");
return; return;
} }
String configSettings = Base64Util.decode(encodedConfigSettings.get()); String configSettings = Base64Util.decode(encodedConfigSettings.get());
Map<String, String> pathValueMap = getPathsAndValues(configSettings); Map<String, String> pathValueMap = getPathsAndValues(configSettings);
Log.debug("NetworkSettings: Updating Settings");
ServerSpecificSettings.updateSettings(pathValueMap); ServerSpecificSettings.updateSettings(pathValueMap);
} }
private Map<String, String> getPathsAndValues(String configSettings) { private Map<String, String> getPathsAndValues(String configSettings) {
Map<String, String> pathValueMap = new HashMap<>(); Map<String, String> pathValueMap = new HashMap<>();
Log.debug("NetworkSettings: Reading Config String..");
String[] settings = configSettings.split(SPLIT); String[] settings = configSettings.split(SPLIT);
UUID thisServerUUID = ServerInfo.getServerUUID(); UUID thisServerUUID = ServerInfo.getServerUUID();
for (String settingAndVal : settings) { for (String settingAndVal : settings) {
@ -108,6 +109,7 @@ public class NetworkSettings {
public void placeToDatabase() throws DBException, UnsupportedTransferDatabaseException { public void placeToDatabase() throws DBException, UnsupportedTransferDatabaseException {
Map<String, Object> configValues = getConfigValues(); Map<String, Object> configValues = getConfigValues();
Log.debug("NetworkSettings: Building Base64 String..");
StringBuilder transferBuilder = new StringBuilder(); StringBuilder transferBuilder = new StringBuilder();
int size = configValues.size(); int size = configValues.size();
int i = 0; int i = 0;
@ -125,10 +127,12 @@ public class NetworkSettings {
String base64 = Base64Util.encode(transferBuilder.toString()); String base64 = Base64Util.encode(transferBuilder.toString());
Log.debug("NetworkSettings: Saving Config settings to database..");
Database.getActive().transfer().storeConfigSettings(base64); Database.getActive().transfer().storeConfigSettings(base64);
} }
private Map<String, Object> getConfigValues() throws DBException { private Map<String, Object> getConfigValues() throws DBException {
Log.debug("NetworkSettings: Loading Config Values..");
Map<String, Object> configValues = new HashMap<>(); Map<String, Object> configValues = new HashMap<>();
addConfigValue(configValues, Settings.DB_TYPE, "mysql"); addConfigValue(configValues, Settings.DB_TYPE, "mysql");
Settings[] sameStrings = new Settings[]{ Settings[] sameStrings = new Settings[]{
@ -138,6 +142,7 @@ public class NetworkSettings {
Settings.FORMAT_MINUTES, Settings.FORMAT_MONTHS, Settings.FORMAT_MONTH, Settings.FORMAT_MINUTES, Settings.FORMAT_MONTHS, Settings.FORMAT_MONTH,
Settings.FORMAT_YEAR, Settings.FORMAT_YEARS, Settings.FORMAT_ZERO_SECONDS Settings.FORMAT_YEAR, Settings.FORMAT_YEARS, Settings.FORMAT_ZERO_SECONDS
}; };
Log.debug("NetworkSettings: Adding Config Values..");
for (Settings setting : sameStrings) { for (Settings setting : sameStrings) {
addConfigValue(configValues, setting, setting.toString()); addConfigValue(configValues, setting, setting.toString());
} }
@ -159,6 +164,7 @@ public class NetworkSettings {
} }
private void addServerSpecificValues(Map<String, Object> configValues) throws DBException { private void addServerSpecificValues(Map<String, Object> configValues) throws DBException {
Log.debug("NetworkSettings: Adding Server-specific Config Values..");
ServerSpecificSettings settings = Settings.serverSpecific(); ServerSpecificSettings settings = Settings.serverSpecific();
for (UUID serverUUID : Database.getActive().fetch().getServerUUIDs()) { for (UUID serverUUID : Database.getActive().fetch().getServerUUIDs()) {