andreacavalli/tdlib-session-container
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update AsyncTdMiddleEventBusServer.java

Browse Source
This commit is contained in:
Andrea Cavalli 2021-01-13 18:21:34 +01:00
parent 449d513f1a
commit ed7d12e9ba
1 changed files with 86 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/main/java/it/tdlight/tdlibsession/td/middle/server/AsyncTdMiddleEventBusServer.java
View File

@ -56,7 +56,6 @@ public class AsyncTdMiddleEventBusServer extends AbstractVerticle {
protected AsyncTdDirectImpl td; protected AsyncTdDirectImpl td;
private final Scheduler tdSrvPoll; private final Scheduler tdSrvPoll;
private final Scheduler vertxStatusScheduler = Schedulers.newSingle("VertxStatus", false);
/** /**
* Value is not important, emits when a request is received * Value is not important, emits when a request is received
*/ */
@ -82,7 +81,6 @@ public class AsyncTdMiddleEventBusServer extends AbstractVerticle {
@Override @Override
public void start(Promise<Void> startPromise) { public void start(Promise<Void> startPromise) {
vertxStatusScheduler.schedule(() -> {
var botAddress = config().getString("botAddress"); var botAddress = config().getString("botAddress");
if (botAddress == null || botAddress.isEmpty()) { if (botAddress == null || botAddress.isEmpty()) {
throw new IllegalArgumentException("botAddress is not set!"); throw new IllegalArgumentException("botAddress is not set!");
@ -132,7 +130,6 @@ public class AsyncTdMiddleEventBusServer extends AbstractVerticle {
startPromise.fail(h.cause()); startPromise.fail(h.cause());
} }
}); });
});
} }
public void onBeforeStop(Consumer<Promise<Void>> r) { public void onBeforeStop(Consumer<Promise<Void>> r) {
@ -145,43 +142,7 @@ public class AsyncTdMiddleEventBusServer extends AbstractVerticle {
@Override @Override
public void stop(Promise<Void> stopPromise) { public void stop(Promise<Void> stopPromise) {
vertxStatusScheduler.schedule(() -> {
runAll(onBeforeStopListeners, onBeforeStopHandler -> {
if (onBeforeStopHandler.failed()) {
logger.error("A beforeStop listener failed: "+ onBeforeStopHandler.cause());
}
Mono.create(sink -> this.isWorkingConsumer.unregister(result -> {
if (result.failed()) {
logger.error("Can't unregister consumer", result.cause());
}
this.startConsumer.unregister(result2 -> {
if (result2.failed()) {
logger.error("Can't unregister consumer", result2.cause());
}
this.executeConsumer.unregister(result4 -> {
if (result4.failed()) {
logger.error("Can't unregister consumer", result4.cause());
}
sink.success();
});
});
})).doFinally(signalType -> {
logger.info("TdMiddle verticle \"" + botAddress + "\" stopped");
runAll(onAfterStopListeners, onAfterStopHandler -> {
if (onAfterStopHandler.failed()) {
logger.error("An afterStop listener failed: " + onAfterStopHandler.cause());
}
stopPromise.complete(); stopPromise.complete();
});
}).subscribeOn(this.tdSrvPoll).subscribe(v -> {}, ex -> {
logger.error("Error when stopping", ex);
}, () -> {});
});
});
} }
private void runAll(List<Consumer<Promise<Void>>> actions, Handler<AsyncResult<Void>> resultHandler) { private void runAll(List<Consumer<Promise<Void>>> actions, Handler<AsyncResult<Void>> resultHandler) {
@ -246,12 +207,47 @@ public class AsyncTdMiddleEventBusServer extends AbstractVerticle {
} }
private void undeploy(Runnable whenUndeployed) { private void undeploy(Runnable whenUndeployed) {
runAll(onBeforeStopListeners, onBeforeStopHandler -> {
if (onBeforeStopHandler.failed()) {
logger.error("A beforeStop listener failed: "+ onBeforeStopHandler.cause());
}
Mono.create(sink -> this.isWorkingConsumer.unregister(result -> {
if (result.failed()) {
logger.error("Can't unregister consumer", result.cause());
}
this.startConsumer.unregister(result2 -> {
if (result2.failed()) {
logger.error("Can't unregister consumer", result2.cause());
}
this.executeConsumer.unregister(result4 -> {
if (result4.failed()) {
logger.error("Can't unregister consumer", result4.cause());
}
sink.success();
});
});
})).doFinally(signalType -> {
logger.info("TdMiddle verticle \"" + botAddress + "\" stopped");
runAll(onAfterStopListeners, onAfterStopHandler -> {
if (onAfterStopHandler.failed()) {
logger.error("An afterStop listener failed: " + onAfterStopHandler.cause());
}
vertx.undeploy(deploymentID(), undeployed -> { vertx.undeploy(deploymentID(), undeployed -> {
if (undeployed.failed()) { if (undeployed.failed()) {
logger.error("Error when undeploying td verticle", undeployed.cause()); logger.error("Error when undeploying td verticle", undeployed.cause());
} }
whenUndeployed.run(); whenUndeployed.run();
}); });
});
}).subscribeOn(this.tdSrvPoll).subscribe(v -> {}, ex -> {
logger.error("Error when stopping", ex);
}, () -> {});
});
} }
private Mono<Void> pipe() { private Mono<Void> pipe() {