summaryrefslogtreecommitdiff
path: root/src/main/patch/eagle/default-bak20211124-080400.patch
blob: c7d3a8c26f31962968fca84bea586a2f7ca08a03 (plain)
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
102
103

  General patch to fix crappy desing.

  Contains:
  - Logging override to get back control over logging.
  - Listen on localhost only.
  - Disable NSync. To suppress that useless noise.


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
@@ -21,7 +21,27 @@
         <skip.node.install>true</skip.node.install>
 	</properties>
 	<dependencies>
-		<!-- project -->
+        <dependency>                                  <!-- TODO: Remove -->
+            <groupId>org.slf4j</groupId>                <!-- TODO: Remove -->
+            <artifactId>slf4j-api</artifactId>          <!-- TODO: Remove -->
+            <version>1.7.25</version>                   <!-- TODO: Remove -->
+        </dependency>                                 <!-- TODO: Remove -->
+        <dependency>                                  <!-- TODO: Remove -->
+            <groupId>org.slf4j</groupId>                <!-- TODO: Remove -->
+            <artifactId>slf4j-simple</artifactId>       <!-- TODO: Remove -->
+            <version>1.7.25</version>                   <!-- TODO: Remove -->
+        </dependency>                                 <!-- TODO: Remove -->
+        <dependency>                                  <!-- TODO: Remove -->
+            <groupId>org.slf4j</groupId>              <!-- TODO: Remove -->
+            <artifactId>jcl-over-slf4j</artifactId>   <!-- TODO: Remove -->
+            <version>1.7.25</version>                 <!-- TODO: Remove -->
+        </dependency>                                 <!-- TODO: Remove -->
+        <dependency>                                  <!-- TODO: Remove -->
+            <groupId>org.slf4j</groupId>              <!-- TODO: Remove -->
+            <artifactId>jul-to-slf4j</artifactId>     <!-- TODO: Remove -->
+            <version>1.7.25</version>                 <!-- TODO: Remove -->
+        </dependency>                                 <!-- TODO: Remove -->
+        <!-- project -->
 		<dependency>
 			<groupId>ch.post.it.paisa.eagle</groupId>
 			<artifactId>eagle-domain</artifactId>
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
@@ -268,7 +268,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);
 
         ReturnHttpErrorHandler returnHttpErrorHandler = new ReturnHttpErrorHandler(RETURN_HTTP_ERROR_ROOT);
 
@@ -377,9 +377,9 @@ public class MainVerticle extends AbstractVerticle {
                                                 if (classpathResourceHandler.handle(request)) {
                                                     return;
                                                 }
-                                                if (nSyncHandler.handle(request)) {
-                                                    return;
-                                                }
+                                                //if (nSyncHandler.handle(request)) {
+                                                //    return;
+                                                //}
 
                                                 // Attention to the order of handlers - handlers from here can fire selfrequests
                                                 if ((env.equals("dev") || env.equals("test")) && validationHandler.isToValidate(request)) {
@@ -440,7 +440,7 @@ public class MainVerticle extends AbstractVerticle {
                                     vertxRouter.route().handler(routingContextHandler);
 
                                     mainServer.requestHandler(vertxRouter::accept);
-                                    mainServer.listen(mainPort, x -> {
+                                    mainServer.listen(mainPort, "127.0.0.1", x -> {
                                         propertyHandler.addRefreshable(schedulerResourceManager);
                                         log.info("<init> I am ready");
                                         String bootLogFilename = props.getOrDefault("service.boot.log", "/data/init/boot.log").toString();
@@ -530,7 +530,7 @@ public class MainVerticle extends AbstractVerticle {
         final Future<String> storageDataFuture      = newLoggingFuture.apply("storage-data"     );
         final Future<String> mirrorModFuture        = newLoggingFuture.apply("MirrorMod"        );
         final Future<String> metricsModuleFuture    = newLoggingFuture.apply("MetricsModule"    );
-        final Future<String> nsyncFuture            = newLoggingFuture.apply("NSync"            );
+        //final Future<String> nsyncFuture            = newLoggingFuture.apply("NSync"            );
         CompositeFuture.all(futuresToWaitFor).setHandler(handler);
 
 
@@ -669,11 +669,11 @@ 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, nsyncFuture.completer());
+//            NSyncVerticleConfig nSyncVerticleConfig = new NSyncVerticleConfig()
+//                    .withBasePath(EAGLE_NSYNC_PATH)
+//                    .withMainPort(mainPort);
+//            DeploymentOptions deplOpt = new DeploymentOptions().setConfig(JsonObject.mapFrom(nSyncVerticleConfig));
+//            vertx.deployVerticle(new NSyncVerticle(), deplOpt, nsyncFuture.completer());
         }
 
         vertx.deployVerticle(new DirectMemoryUsageLogger(), new DeploymentOptions().setConfig(new JsonObject(props)));