defaultSlowwarnMS = defaultTimeoutMS

lightblue-platform · Aug 23, 2016 · b3c1ed6 · b3c1ed6
1 parent 7892104
commit b3c1ed6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/facade/src/main/java/com/redhat/lightblue/migrator/facade/TimeoutConfiguration.java b/facade/src/main/java/com/redhat/lightblue/migrator/facade/TimeoutConfiguration.java
@@ -42,8 +42,7 @@ public enum Type {
 
     public static final String CONFIG_PREFIX = "com.redhat.lightblue.migrator.facade.";
 
-    private long defaultTimeoutMS;
-    private long defaultSlowwarnMS;
+    private final long defaultTimeoutMS, defaultSlowwarnMS;
     private String beanName;
     private Properties properties;
     private boolean interruptOnTimeout = true;
@@ -81,13 +80,14 @@ public TimeoutConfiguration(long defaultTimeoutMS, long defaultSlowwarnMS, Strin
     /**
     *
     * @param defaultTimeoutMS Use this timeout if nothing matches in the
-    * properties. For defaultSlowwarnMS, it will use 2x defaultTimeoutMS.
+    * properties. For defaultSlowwarnMS, it will use defaultTimeoutMS.
+    * (so it doesn't log both timeout and slowwarn unless source is slow)
     * @param beanName bean name to use, e.g. CountryDAO
     * @param properties properties read from a file with timeout settings. Can
     * be null.
     */
     public TimeoutConfiguration(long defaultTimeoutMS, String beanName, Properties properties) {
-        this(defaultTimeoutMS, 2*defaultTimeoutMS, beanName, properties);
+        this(defaultTimeoutMS, defaultTimeoutMS, beanName, properties);
     }
 
     /**

diff --git a/facade/src/test/java/com/redhat/lightblue/migrator/facade/TimeoutConfigurationTest.java b/facade/src/test/java/com/redhat/lightblue/migrator/facade/TimeoutConfigurationTest.java
@@ -76,10 +76,10 @@ public void testSlowWarning() {
 
         t = new TimeoutConfiguration(2000, "BarService", p);
 
-        Assert.assertEquals(4000, t.getSlowWarningMS("foo", FacadeOperation.READ));
-        Assert.assertEquals(4000, t.getSlowWarningMS("bar", FacadeOperation.WRITE));
-        Assert.assertEquals(4000, t.getSlowWarningMS("fooBar", FacadeOperation.WRITE));
-        Assert.assertEquals(4000, t.getSlowWarningMS("fooBar", FacadeOperation.READ));
+        Assert.assertEquals(2000, t.getSlowWarningMS("foo", FacadeOperation.READ));
+        Assert.assertEquals(2000, t.getSlowWarningMS("bar", FacadeOperation.WRITE));
+        Assert.assertEquals(2000, t.getSlowWarningMS("fooBar", FacadeOperation.WRITE));
+        Assert.assertEquals(2000, t.getSlowWarningMS("fooBar", FacadeOperation.READ));
         Assert.assertEquals(2000, t.getTimeoutMS("fooBar", FacadeOperation.READ));
     }