Merge branch '1.4.x'

spring-boot-admin-server-ui/modules/applications/module.js

@@ -123,8 +123,8 @@ module.run(function ($rootScope, $state, Notification, Application, ApplicationG
       };
 
       if (event.type === 'REGISTRATION') {
-        applicationGroups.addApplication(event.application, false);
-        refresh(event.application);
+        var group = applicationGroups.addApplication(event.application, false);
+        refresh(group, event.application);
         title += ' instance registered.';
         options.tag = event.application.id + '-REGISTRY';
       } else if (event.type === 'DEREGISTRATION') {
@@ -132,8 +132,8 @@ module.run(function ($rootScope, $state, Notification, Application, ApplicationG
         title += ' instance removed.';
         options.tag = event.application.id + '-REGISTRY';
       } else if (event.type === 'STATUS_CHANGE') {
-        refresh(event.application);
-        applicationGroups.addApplication(event.application, true);
+        var group2 = applicationGroups.addApplication(event.application, true);
+        refresh(group2, event.application);
         title += ' instance is ' + event.to.status;
         options.tag = event.application.id + '-STATUS';
         options.icon = event.to.status !== 'UP' ? require('./img/error.png') : require('./img/ok.png');

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/journal/web/JournalController.java

@@ -21,13 +21,17 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.event.EventListener;
 import org.springframework.http.MediaType;
 import org.springframework.util.MimeTypeUtils;
+import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.context.request.async.AsyncRequestTimeoutException;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import de.codecentric.boot.admin.event.ClientApplicationEvent;
@@ -81,4 +85,9 @@ public class JournalController {
 			}
 		}
 	}
+
+	@ExceptionHandler(AsyncRequestTimeoutException.class)
+	public void asyncRequestTimeoutExceptionHandler(HttpServletRequest req) {
+		LOGGER.debug("Async request to '{}' timed out", req.getRequestURI());
+	}
 }