diff options
author | Andreas Fankhauser hiddenalpha.ch | 2023-10-24 10:46:52 +0200 |
---|---|---|
committer | Andreas Fankhauser hiddenalpha.ch | 2023-10-24 10:46:52 +0200 |
commit | e29169dad507e73591e5f3ca9cbaeb57ea90df99 (patch) | |
tree | c26e77d2a88cc29819dc0c87668b9651501e3a4a | |
parent | acf2ebad30b50cfb7666d8e9945892c0d7e4b737 (diff) | |
download | UnspecifiedGarbage-e29169dad507e73591e5f3ca9cbaeb57ea90df99.zip UnspecifiedGarbage-e29169dad507e73591e5f3ca9cbaeb57ea90df99.tar.gz |
(patch) Add eagle patches
-rw-r--r-- | src/main/patch/eagle/default-bak20211124-080400.patch | 103 | ||||
-rw-r--r-- | src/main/patch/eagle/default-bak20230220-121000.patch | 102 | ||||
-rw-r--r-- | src/main/patch/eagle/default-bak20231024-082300.patch | 101 | ||||
-rw-r--r-- | src/main/patch/eagle/default.patch | 101 | ||||
-rw-r--r-- | src/main/patch/eagle/simplelogger.patch | 33 |
5 files changed, 440 insertions, 0 deletions
diff --git a/src/main/patch/eagle/default-bak20211124-080400.patch b/src/main/patch/eagle/default-bak20211124-080400.patch new file mode 100644 index 0000000..c7d3a8c --- /dev/null +++ b/src/main/patch/eagle/default-bak20211124-080400.patch @@ -0,0 +1,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))); diff --git a/src/main/patch/eagle/default-bak20230220-121000.patch b/src/main/patch/eagle/default-bak20230220-121000.patch new file mode 100644 index 0000000..76cedd0 --- /dev/null +++ b/src/main/patch/eagle/default-bak20230220-121000.patch @@ -0,0 +1,102 @@ + + 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. + + +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,6 +21,28 @@ + <skip.node.install>true</skip.node.install> + </properties> + <dependencies> ++ <!-- ******************************************* TODO: Remove --> ++ <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 --> ++ <!-- ******************************************* 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 +@@ -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); + +@@ -325,7 +325,7 @@ public class MainVerticle extends AbstractVerticle { + .withLoggingResourceManager(loggingResourceManager) + .withMonitoringHandler(monitoringHandler) + .withHttpClientFactory(this::createHttpClientForRouter) +- .addDoneHandler(aVoid -> this.onRouterReady(selfClient, classpathResourceHandler, returnHttpErrorHandler, nSyncHandler)) ++ .addDoneHandler(aVoid -> this.onRouterReady(selfClient, classpathResourceHandler, returnHttpErrorHandler, null)) + .build(); + }); + }); +@@ -412,9 +412,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; + } +@@ -559,7 +559,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); + + +@@ -721,10 +721,10 @@ public class MainVerticle extends AbstractVerticle { + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + { +- 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))); diff --git a/src/main/patch/eagle/default-bak20231024-082300.patch b/src/main/patch/eagle/default-bak20231024-082300.patch new file mode 100644 index 0000000..5578433 --- /dev/null +++ b/src/main/patch/eagle/default-bak20231024-082300.patch @@ -0,0 +1,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))); diff --git a/src/main/patch/eagle/default.patch b/src/main/patch/eagle/default.patch new file mode 100644 index 0000000..c0b6785 --- /dev/null +++ b/src/main/patch/eagle/default.patch @@ -0,0 +1,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 +@@ -367,7 +367,7 @@ public class MainVerticle extends AbstractVerticle { + 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); +@@ -470,7 +470,7 @@ public class MainVerticle extends AbstractVerticle { + selfClient, + classpathResourceHandler, + returnHttpErrorHandler, +- nSyncHandler, ++ null, + authorizer)) + .build(); + }); +@@ -607,9 +607,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; + } +@@ -777,7 +777,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); + + String redisHost = (String) props.get("redis.host"); +@@ -979,10 +979,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); ++ //NSyncVerticleConfig nSyncVerticleConfig = /*TODO revert*/ ++ // new NSyncVerticleConfig().withBasePath(EAGLE_NSYNC_PATH).withMainPort(mainPort); /*TODO revert*/ ++ //DeploymentOptions deplOpt = /*TODO revert*/ ++ // new DeploymentOptions().setConfig(JsonObject.mapFrom(nSyncVerticleConfig)); /*TODO revert*/ ++ //vertx.deployVerticle(new NSyncVerticle(), deplOpt, nsyncPromise); /*TODO revert*/ + } + } + diff --git a/src/main/patch/eagle/simplelogger.patch b/src/main/patch/eagle/simplelogger.patch new file mode 100644 index 0000000..97cd8de --- /dev/null +++ b/src/main/patch/eagle/simplelogger.patch @@ -0,0 +1,33 @@ +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> |