Merge pull request #16 from rchodava/logging-fixes

Fix erroneous logging about which request is matched
rchodava · Mar 14, 2016 · dc02eaf · dc02eaf
2 parents c83543c + bb42117
commit dc02eaf
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/core/src/main/java/org/chodavarapu/datamill/http/impl/MethodAndUriMatcher.java b/core/src/main/java/org/chodavarapu/datamill/http/impl/MethodAndUriMatcher.java
@@ -31,7 +31,12 @@ public MethodAndUriMatcher(Method method, String pattern, Route route) {
 
     @Override
     public boolean matches(ServerRequest request) {
-        return matchesMethod(request) && matchesUri(request);
+        boolean matches = matchesMethod(request) && matchesUri(request);
+        if (matches) {
+            logger.debug("Request matched {} {}", method, uriTemplate == null ? "*" : uriTemplate);
+        }
+
+        return matches;
     }
 
     private boolean matchesUri(ServerRequest request) {
@@ -42,13 +47,11 @@ private boolean matchesUri(ServerRequest request) {
                     ((ServerRequestImpl) request).setUriParameters(uriParameters);
                 }
 
-                logger.debug("Request matched {} {}", method, uriTemplate);
                 return true;
             } else {
                 return false;
             }
         } else {
-            logger.debug("Request matched {} *", method);
             return true;
         }
     }