Browse Source

Disable database automatic fetching when delay <= 0.

However /rscp fetch will work as it should.
master
SimSonic 10 years ago
parent
commit
5f39215514
  1. 4
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java
  2. 7
      src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java

4
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java

@ -75,6 +75,8 @@ public class BukkitPluginConfiguration implements Settings
bUseResidence = config.getBoolean("settings.integration.residence", true); bUseResidence = config.getBoolean("settings.integration.residence", true);
nAutoReloadDelayTicks = config.getInt("settings.auto-reload-delay-sec", 900) * 20; nAutoReloadDelayTicks = config.getInt("settings.auto-reload-delay-sec", 900) * 20;
nRegionFinderGranularity = config.getInt("settings.region-finder-thread-granularity-msec", 1000); nRegionFinderGranularity = config.getInt("settings.region-finder-thread-granularity-msec", 1000);
if(nAutoReloadDelayTicks <= 0)
nAutoReloadDelayTicks = -1;
} }
@Override @Override
public String getDefaultGroup() public String getDefaultGroup()
@ -94,7 +96,7 @@ public class BukkitPluginConfiguration implements Settings
@Override @Override
public void setMaintenanceMode(String mode) public void setMaintenanceMode(String mode)
{ {
strMaintenanceMode = (mode == null) ? "" : mode; strMaintenanceMode = (mode != null) ? mode : "";
plugin.getConfig().set("settings.maintenance-mode", strMaintenanceMode); plugin.getConfig().set("settings.maintenance-mode", strMaintenanceMode);
plugin.saveConfig(); plugin.saveConfig();
} }

7
src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java

@ -89,6 +89,7 @@ public final class BukkitPluginMain extends JavaPlugin
regionUpdateObserver.startDeamon(); regionUpdateObserver.startDeamon();
// Connect to database and initiate data fetching // Connect to database and initiate data fetching
connection.initialize(settings.getConnectionParams()); connection.initialize(settings.getConnectionParams());
if(settings.getAutoReloadDelayTicks() > 0)
commandHelper.threadFetchDatabaseContents.startDeamon(); commandHelper.threadFetchDatabaseContents.startDeamon();
// Done // Done
consoleLog.info(Phrases.PLUGIN_ENABLED.toString()); consoleLog.info(Phrases.PLUGIN_ENABLED.toString());
@ -112,14 +113,16 @@ public final class BukkitPluginMain extends JavaPlugin
if(nAutoUpdaterTaskId != -1) if(nAutoUpdaterTaskId != -1)
scheduler.cancelTask(nAutoUpdaterTaskId); scheduler.cancelTask(nAutoUpdaterTaskId);
final int delay = settings.getAutoReloadDelayTicks(); final int delay = settings.getAutoReloadDelayTicks();
nAutoUpdaterTaskId = scheduler.scheduleSyncDelayedTask(this, new Runnable() nAutoUpdaterTaskId = delay > 0
? scheduler.scheduleSyncDelayedTask(this, new Runnable()
{ {
@Override @Override
public void run() public void run()
{ {
commandHelper.threadFetchDatabaseContents.startDeamon(); commandHelper.threadFetchDatabaseContents.startDeamon();
} }
}, delay); }, delay)
: -1;
} }
@Override @Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args)

Loading…
Cancel
Save