chibenwa commented on code in PR #3198:
URL: https://github.com/apache/james-project/pull/3198#discussion_r4132403051
##########
protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java:
##########
@@ -77,87 +79,158 @@ public void configure(ImapConfiguration imapConfiguration)
{
super.configure(imapConfiguration);
this.heartbeatInterval =
imapConfiguration.idleTimeIntervalAsDuration();
- this.enableIdle = imapConfiguration.isEnableIdle();
+ this.enableIdle = imapConfiguration.isEnableIdle() &&
!heartbeatInterval.isZero() && !heartbeatInterval.isNegative();
}
@Override
protected Mono<Void> processRequestReactive(IdleRequest request,
ImapSession session, Responder responder) {
- CountDownLatch countDownLatch = new CountDownLatch(1);
- return Mono.fromRunnable(() -> idle(request, session, responder,
countDownLatch))
- .then(unsolicitedResponses(session, responder, false))
+ Responder safeResponder = session.threadSafe(responder);
+ SelectedMailbox selectedMailbox = session.getSelected();
+ Sinks.One<Void> idleReadySink = Sinks.one();
+ AtomicBoolean idleActive = new AtomicBoolean(true);
+ AtomicBoolean lineHandlerAdded = new AtomicBoolean(false);
+
+ IdleMailboxListener idleListener = selectedMailbox != null
+ ? new IdleMailboxListener(session, safeResponder, idleReadySink,
idleActive)
+ : null;
+
+ return Mono.fromRunnable(() -> idle(request, session, safeResponder,
selectedMailbox, idleReadySink, idleActive, lineHandlerAdded, idleListener))
+ .then(unsolicitedResponses(session, safeResponder, false))
.onErrorResume(e -> {
- no(request, responder,
HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
+ cleanupIdle(session, selectedMailbox, idleActive,
lineHandlerAdded, idleReadySink, idleListener);
+ no(request, safeResponder,
HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
return logAsMono(() -> LOGGER.error("Encountered error
executing IMAP IDLE", e));
})
- .then(Mono.fromRunnable(countDownLatch::countDown));
+ .doFinally(signalType -> idleReadySink.tryEmitEmpty());
}
- private void idle(IdleRequest request, ImapSession session, Responder
responder, CountDownLatch countDownLatch) {
- SelectedMailbox sm = session.getSelected();
- if (sm != null) {
- sm.registerIdle(new IdleMailboxListener(session, responder,
countDownLatch));
+ private boolean cleanupIdle(ImapSession session, SelectedMailbox
selectedMailbox, AtomicBoolean idleActive,
+ AtomicBoolean lineHandlerAdded,
Sinks.One<Void> idleReadySink,
+ EventListener.ReactiveEventListener
idleListener) {
+ boolean cleanupOwner = idleActive.compareAndSet(true, false);
+ if (cleanupOwner) {
+ if (selectedMailbox != null && idleListener != null) {
+ try {
+ selectedMailbox.unregisterIdle(idleListener);
+ } catch (Exception e) {
+ LOGGER.debug("Failed to unregister IDLE listener", e);
+ }
+ }
+ try {
+ if (session != null && lineHandlerAdded.compareAndSet(true,
false)) {
+ session.popLineHandler();
+ }
+ } finally {
+ idleReadySink.tryEmitEmpty();
+ }
+ return true;
}
+ return false;
+ }
- final AtomicBoolean idleActive = new AtomicBoolean(true);
-
- session.pushLineHandler((session1, data) -> Mono.fromRunnable(() -> {
- String line;
- if (data.length > 2) {
- line = new String(data, 0, data.length - 2);
+ private void idle(IdleRequest request, ImapSession session, Responder
safeResponder, SelectedMailbox selectedMailbox,
+ Sinks.One<Void> idleReadySink, AtomicBoolean idleActive,
AtomicBoolean lineHandlerAdded,
+ IdleMailboxListener idleListener) {
+ try {
+ if (selectedMailbox != null) {
+ selectedMailbox.registerIdle(idleListener);
} else {
- line = "";
+ idleReadySink.tryEmitEmpty();
+ }
+
+ lineHandlerAdded.set(true);
+ try {
+ session.pushLineHandler((session1, data) -> {
+ if (!idleActive.get()) {
+ return Mono.empty();
+ }
+ if (!cleanupIdle(session1, selectedMailbox, idleActive,
lineHandlerAdded, idleReadySink, idleListener)) {
+ return Mono.empty();
+ }
Review Comment:
I wonder if we really should shortcut here
The client sent a DONE so imo it cares about IDLE no longer being registerer
and not about why did do the cleanup.
We need to respond OK either way as far as I undersntand it.
```suggestion
!cleanupIdle(session1, selectedMailbox, idleActive, lineHandlerAdded,
idleReadySink, idleListener)
```
##########
protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java:
##########
@@ -77,87 +79,158 @@ public void configure(ImapConfiguration imapConfiguration)
{
super.configure(imapConfiguration);
this.heartbeatInterval =
imapConfiguration.idleTimeIntervalAsDuration();
- this.enableIdle = imapConfiguration.isEnableIdle();
+ this.enableIdle = imapConfiguration.isEnableIdle() &&
!heartbeatInterval.isZero() && !heartbeatInterval.isNegative();
}
@Override
protected Mono<Void> processRequestReactive(IdleRequest request,
ImapSession session, Responder responder) {
- CountDownLatch countDownLatch = new CountDownLatch(1);
- return Mono.fromRunnable(() -> idle(request, session, responder,
countDownLatch))
- .then(unsolicitedResponses(session, responder, false))
+ Responder safeResponder = session.threadSafe(responder);
+ SelectedMailbox selectedMailbox = session.getSelected();
+ Sinks.One<Void> idleReadySink = Sinks.one();
+ AtomicBoolean idleActive = new AtomicBoolean(true);
+ AtomicBoolean lineHandlerAdded = new AtomicBoolean(false);
+
+ IdleMailboxListener idleListener = selectedMailbox != null
+ ? new IdleMailboxListener(session, safeResponder, idleReadySink,
idleActive)
+ : null;
+
+ return Mono.fromRunnable(() -> idle(request, session, safeResponder,
selectedMailbox, idleReadySink, idleActive, lineHandlerAdded, idleListener))
+ .then(unsolicitedResponses(session, safeResponder, false))
.onErrorResume(e -> {
- no(request, responder,
HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
+ cleanupIdle(session, selectedMailbox, idleActive,
lineHandlerAdded, idleReadySink, idleListener);
+ no(request, safeResponder,
HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
return logAsMono(() -> LOGGER.error("Encountered error
executing IMAP IDLE", e));
})
- .then(Mono.fromRunnable(countDownLatch::countDown));
+ .doFinally(signalType -> idleReadySink.tryEmitEmpty());
}
- private void idle(IdleRequest request, ImapSession session, Responder
responder, CountDownLatch countDownLatch) {
- SelectedMailbox sm = session.getSelected();
- if (sm != null) {
- sm.registerIdle(new IdleMailboxListener(session, responder,
countDownLatch));
+ private boolean cleanupIdle(ImapSession session, SelectedMailbox
selectedMailbox, AtomicBoolean idleActive,
+ AtomicBoolean lineHandlerAdded,
Sinks.One<Void> idleReadySink,
+ EventListener.ReactiveEventListener
idleListener) {
+ boolean cleanupOwner = idleActive.compareAndSet(true, false);
+ if (cleanupOwner) {
+ if (selectedMailbox != null && idleListener != null) {
+ try {
+ selectedMailbox.unregisterIdle(idleListener);
+ } catch (Exception e) {
+ LOGGER.debug("Failed to unregister IDLE listener", e);
+ }
+ }
+ try {
+ if (session != null && lineHandlerAdded.compareAndSet(true,
false)) {
+ session.popLineHandler();
+ }
+ } finally {
+ idleReadySink.tryEmitEmpty();
+ }
+ return true;
}
+ return false;
+ }
- final AtomicBoolean idleActive = new AtomicBoolean(true);
-
- session.pushLineHandler((session1, data) -> Mono.fromRunnable(() -> {
- String line;
- if (data.length > 2) {
- line = new String(data, 0, data.length - 2);
+ private void idle(IdleRequest request, ImapSession session, Responder
safeResponder, SelectedMailbox selectedMailbox,
+ Sinks.One<Void> idleReadySink, AtomicBoolean idleActive,
AtomicBoolean lineHandlerAdded,
+ IdleMailboxListener idleListener) {
+ try {
+ if (selectedMailbox != null) {
+ selectedMailbox.registerIdle(idleListener);
} else {
- line = "";
+ idleReadySink.tryEmitEmpty();
+ }
+
+ lineHandlerAdded.set(true);
+ try {
+ session.pushLineHandler((session1, data) -> {
+ if (!idleActive.get()) {
+ return Mono.empty();
+ }
+ if (!cleanupIdle(session1, selectedMailbox, idleActive,
lineHandlerAdded, idleReadySink, idleListener)) {
+ return Mono.empty();
+ }
Review Comment:
I wonder if we really should shortcut here
The client sent a DONE so imo it cares about IDLE no longer being registerer
and not about why did do the cleanup.
We need to respond OK either way as far as I undersntand it.
```suggestion
cleanupIdle(session1, selectedMailbox, idleActive, lineHandlerAdded,
idleReadySink, idleListener)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
