summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-05-12 16:31:40 +0100
committerKHobbits <rob@khobbits.co.uk>2013-05-12 16:31:40 +0100
commit6d317fd26df79ff2faec40dbc60c24d5e8980143 (patch)
tree5be79f44ce4ca4be403fd39424e6389d8ba0b5d8
parent8ebe55a2944560446e798fe40f7c39ce2b3c2b26 (diff)
downloadEssentials-6d317fd26df79ff2faec40dbc60c24d5e8980143.tar
Essentials-6d317fd26df79ff2faec40dbc60c24d5e8980143.tar.gz
Essentials-6d317fd26df79ff2faec40dbc60c24d5e8980143.tar.lz
Essentials-6d317fd26df79ff2faec40dbc60c24d5e8980143.tar.xz
Essentials-6d317fd26df79ff2faec40dbc60c24d5e8980143.zip
Small tweak to warning display and make config variable 'economy-lag-warning' set in ms not ns.
-rw-r--r--Essentials/src/com/earth2me/essentials/Settings.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/User.java2
2 files changed, 4 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index f8b381b21..c4da3367c 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -1081,7 +1081,9 @@ public class Settings implements ISettings
private long _getEconomyLagWarning()
{
- return config.getLong("economy-lag-warning", 20000000L); // Default to 20ms
+ // Default to 20ms
+ final long value = (long)(config.getDouble("economy-lag-warning", 20.0) * 1000000);
+ return value;
}
@Override
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index 3f310b0ea..0d112dd79 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -399,7 +399,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
final long elapsed = System.nanoTime() - start;
if (elapsed > ess.getSettings().getEconomyLagWarning())
{
- ess.getLogger().log(Level.INFO, "Lag Notice - Slow Economy Response - Request took over {0}ms!", elapsed / 1000000);
+ ess.getLogger().log(Level.INFO, "Lag Notice - Slow Economy Response - Request took over {0}ms!", elapsed / 1000000.0);
}
return value;
}