1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
|
General patch to fix crappy desing.
Contains:
- Logging override to get back control over logging.
- Listen on localhost only (DISABLED for zarniwoop)
- Disable NSync. To suppress that useless noise.
Based on "326188f9ed8830cce3ec9865ea3598945726c308" from "2023-02-13" near
"eagle-02.01.10.00".
diff --git a/eagle-process/pom.xml b/eagle-process/pom.xml
index 5b226670..45acc276 100644
--- a/eagle-process/pom.xml
+++ b/eagle-process/pom.xml
@@ -23,6 +23,23 @@
</properties>
<dependencies>
+ <!-- ******************************************* TODO: Remove -->
+ <dependency> <!-- TODO: Remove -->
+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
+ <artifactId>slf4j-simple</artifactId> <!-- TODO: Remove -->
+ <version>${slf4j.version}</version> <!-- TODO: Remove -->
+ </dependency> <!-- TODO: Remove -->
+ <dependency> <!-- TODO: Remove -->
+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
+ <artifactId>jcl-over-slf4j</artifactId> <!-- TODO: Remove -->
+ <version>${slf4j.version}</version> <!-- TODO: Remove -->
+ </dependency> <!-- TODO: Remove -->
+ <dependency> <!-- TODO: Remove -->
+ <groupId>org.slf4j</groupId> <!-- TODO: Remove -->
+ <artifactId>jul-to-slf4j</artifactId> <!-- TODO: Remove -->
+ <version>${slf4j.version}</version> <!-- TODO: Remove -->
+ </dependency> <!-- TODO: Remove -->
+ <!-- ******************************************* TODO: Remove -->
<!-- project -->
<dependency>
<groupId>ch.post.it.paisa.eagle</groupId>
diff --git a/eagle-process/src/main/java/ch/post/it/paisa/eagle/process/main/MainVerticle.java b/eagle-process/src/main/java/ch/post/it/paisa/eagle/process/main/MainVerticle.java
index 13ebdc51..9e947a2d 100644
--- a/eagle-process/src/main/java/ch/post/it/paisa/eagle/process/main/MainVerticle.java
+++ b/eagle-process/src/main/java/ch/post/it/paisa/eagle/process/main/MainVerticle.java
@@ -323,7 +323,7 @@ public class MainVerticle extends AbstractVerticle {
doubleSlashCheckHandler = new DoubleSlashCheckHandler(doubleSlashCheckerMode);
ClasspathResourceHandler classpathResourceHandler = new ClasspathResourceHandler("static-web-apps/", SERVER_ROOT + "/apps/");
- NSyncHandler nSyncHandler = new NSyncHandler(vertx, EAGLE_NSYNC_PATH, mainPort);
+ //NSyncHandler nSyncHandler = new NSyncHandler(vertx, EAGLE_NSYNC_PATH, mainPort); /*TODO revert*/
ReturnHttpErrorHandler returnHttpErrorHandler = new ReturnHttpErrorHandler(RETURN_HTTP_ERROR_ROOT);
@@ -387,7 +387,7 @@ public class MainVerticle extends AbstractVerticle {
.withLoggingResourceManager(loggingResourceManager)
.withMonitoringHandler(monitoringHandler)
.withHttpClientFactory(this::createHttpClientForRouter)
- .addDoneHandler(aVoid -> this.onRouterReady(selfClient, classpathResourceHandler, returnHttpErrorHandler, nSyncHandler, authorizer))
+ .addDoneHandler(aVoid -> this.onRouterReady(selfClient, classpathResourceHandler, returnHttpErrorHandler, null, authorizer))
.build();
});
});
@@ -476,9 +476,9 @@ public class MainVerticle extends AbstractVerticle {
if (hookHandler.handle(request)) {
return;
}
- if (nSyncHandler.handle(request)) {
- return;
- }
+ //if (nSyncHandler.handle(request)) {
+ // return;
+ //}
if (eventBusHandler.handle(request)) {
return;
}
@@ -624,7 +624,7 @@ public class MainVerticle extends AbstractVerticle {
final Promise<String> storageLogPromise = newLoggingFuture.apply("storage-log" );
final Promise<String> storageDataPromise = newLoggingFuture.apply("storage-data" );
final Promise<String> metricsModulePromise = newLoggingFuture.apply("MetricsModule" );
- final Promise<String> nsyncPromise = newLoggingFuture.apply("NSync" );
+ //final Promise<String> nsyncPromise = newLoggingFuture.apply("NSync" ); /*TODO revert*/
CompositeFuture.all(futuresToWaitFor).onComplete(handler);
@@ -776,10 +776,10 @@ public class MainVerticle extends AbstractVerticle {
//////////////////////////////////// NSync /////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
{
- NSyncVerticleConfig nSyncVerticleConfig = new NSyncVerticleConfig()
- .withBasePath(EAGLE_NSYNC_PATH)
- .withMainPort(mainPort);
- DeploymentOptions deplOpt = new DeploymentOptions().setConfig(JsonObject.mapFrom(nSyncVerticleConfig));
- vertx.deployVerticle(new NSyncVerticle(), deplOpt, nsyncPromise);
+ // TODO NSyncVerticleConfig nSyncVerticleConfig = new NSyncVerticleConfig()
+ // TODO .withBasePath(EAGLE_NSYNC_PATH)
+ // TODO .withMainPort(mainPort);
+ // TODO DeploymentOptions deplOpt = new DeploymentOptions().setConfig(JsonObject.mapFrom(nSyncVerticleConfig));
+ // TODO vertx.deployVerticle(new NSyncVerticle(), deplOpt, nsyncPromise);
}
vertx.deployVerticle(new DirectMemoryUsageLogger(), new DeploymentOptions().setConfig(new JsonObject(props)));
|
