Made SSE timeout configurable.

FINTLabs · Nov 6, 2017 · 1be4359 · 1be4359
1 parent d99978e
commit 1be4359
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -58,7 +58,7 @@ repositories {
 
 dependencies {
     compile('no.fint:fint-audit-mongo-plugin:1.1.1')
-    compile('no.fint:fint-events:1.0.0')
+    compile('no.fint:fint-events:1.0.1')
     compile('no.fint:fint-event-model:2.0.0')
     compile('no.fint:fint-springfox-extension:0.0.1')
 

diff --git a/src/main/java/no/fint/provider/events/ProviderProps.java b/src/main/java/no/fint/provider/events/ProviderProps.java
@@ -20,4 +20,6 @@ public class ProviderProps {
     @Value("${fint.provider.event-state.list-name:current-corrids}")
     private String key;
 
+    @Value("${fint.provider.sse-timeout-minutes:60}")
+    private int sseTimeoutMinutes;
 }
diff --git a/src/main/java/no/fint/provider/events/eventstate/JanitorService.java b/src/main/java/no/fint/provider/events/eventstate/JanitorService.java
@@ -27,7 +27,8 @@ public void cleanUpEventStates() {
         eventStates.forEach(eventState -> {
             if (eventState.expired()) {
                 Event event = eventState.getEvent();
-                log.info("EventState with corrId {} is expired, removing from list", eventState.getCorrId());
+                log.info("EventState with corrId {} for orgId {} is expired, removing from list", eventState.getCorrId(), eventState.getEvent().getOrgId());
+                log.debug("Event details: {}", eventState);
                 eventStateService.remove(event);
 
                 event.setMessage("Event expired");

diff --git a/src/main/java/no/fint/provider/events/response/ResponseService.java b/src/main/java/no/fint/provider/events/response/ResponseService.java
@@ -28,7 +28,7 @@ public class ResponseService {
     private FintEvents fintEvents;
 
     public void handleAdapterResponse(Event event) {
-        log.info("Event received: {}, action: {}", event.getCorrId(), event.getAction());
+        log.info("Event received: {}, action: {}, orgId: {}", event.getCorrId(), event.getAction(), event.getOrgId());
         if (event.isHealthCheck()) {
             RBlockingQueue<Event> healthCheckQueue = fintEvents.getTempQueue(event.getCorrId());
             fintAuditService.audit(event, Status.TEMP_UPSTREAM_QUEUE);
@@ -42,7 +42,7 @@ public void handleAdapterResponse(Event event) {
                 fintAuditService.audit(event);
                 eventStateService.remove(event);
             } else {
-                log.error("EventState with corrId {} was not found. Either the Event has expired or the provider does not recognize the corrId. action:{} status:{}", event.getCorrId(), event.getAction(), event.getStatus());
+                log.error("EventState with corrId {} was not found. Either the Event has expired or the provider does not recognize the corrId. {}", event.getCorrId(), event);
                 throw new UnknownEventException();
             }
         }

diff --git a/src/main/java/no/fint/provider/events/sse/SseService.java b/src/main/java/no/fint/provider/events/sse/SseService.java
@@ -16,8 +16,6 @@
 @Slf4j
 @Service
 public class SseService {
-    private static final long DEFAULT_TIMEOUT = TimeUnit.MILLISECONDS.convert(1, TimeUnit.HOURS);
-
     @Autowired
     private ProviderProps providerProps;
 
@@ -40,7 +38,7 @@ public SseEmitter subscribe(String id, String orgId) {
             return registeredEmitter.get();
         } else {
             log.info("id: {}, {} connected", id, orgId);
-            FintSseEmitter emitter = new FintSseEmitter(id, DEFAULT_TIMEOUT);
+            FintSseEmitter emitter = new FintSseEmitter(id, TimeUnit.MINUTES.toMillis(providerProps.getSseTimeoutMinutes()));
             emitter.onCompletion(() -> {
                 log.info("onCompletion called for {}, id: {}", orgId, emitter.getId());
                 removeEmitter(orgId, emitter);
@@ -84,8 +82,9 @@ public void send(Event event) {
                     SseEmitter.SseEventBuilder builder = SseEmitter.event().id(event.getCorrId()).name(event.getAction()).data(event).reconnectTime(5000L);
                     emitter.send(builder);
                 } catch (Exception e) {
-                    log.warn("Exception when trying to send message to SseEmitter", e);
+                    log.warn("Exception when trying to send message to SseEmitter", e.getMessage());
                     log.warn("Removing subscriber {}", event.getOrgId());
+                    log.debug("Details: {}", event, e);
                     toBeRemoved.add(emitter);
                 }
             });

diff --git a/src/main/java/no/fint/provider/events/status/StatusService.java b/src/main/java/no/fint/provider/events/status/StatusService.java
@@ -46,7 +46,7 @@ public void updateEventState(Event event) {
                 eventStateService.remove(event);
             }
         } else {
-            log.error("EventState with corrId {} was not found. Either the Event has expired or the provider does not recognize the corrId. action:{} status:{}", event.getCorrId(), event.getAction(), event.getStatus());
+            log.error("EventState with corrId {} was not found. Either the Event has expired or the provider does not recognize the corrId. {}", event.getCorrId(), event);
             throw new UnknownEventException();
         }
     }