Add access log handler to the main router if non-app root-path is dif…

…ferent from root-path
quarkusio · Jul 18, 2022 · d4abc33 · d4abc33
1 parent 0025aff
commit d4abc33
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...tx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java b/...tx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java
@@ -292,6 +292,8 @@ ServiceStartBuildItem finalizeRouter(
                 defaultRoute.map(DefaultRouteBuildItem::getRoute).orElse(null),
                 listOfFilters, vertx.getVertx(), lrc, mainRouter, httpRouteRouter.getHttpRouter(),
                 httpRouteRouter.getMutinyRouter(),
+                nonApplicationRootPathBuildItem.isDedicatedRouterRequired(),
+                nonApplicationRootPathBuildItem.isAttachedToMainRouter(),
                 httpRootPathBuildItem.getRootPath(),
                 launchMode.getLaunchMode(),
                 !requireBodyHandlerBuildItems.isEmpty(), bodyHandler, gracefulShutdownFilter,

diff --git a/...ons/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java b/...ons/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java
@@ -334,6 +334,7 @@ public void finalizeRouter(BeanContainer container, Consumer<Route> defaultRoute
             List<Filter> filterList, Supplier<Vertx> vertx,
             LiveReloadConfig liveReloadConfig, Optional<RuntimeValue<Router>> mainRouterRuntimeValue,
             RuntimeValue<Router> httpRouterRuntimeValue, RuntimeValue<io.vertx.mutiny.ext.web.Router> mutinyRouter,
+            boolean nonApplicationDedicatedRouter, boolean nonApplicationAttachedToMainRouter,
             String rootPath, LaunchMode launchMode, boolean requireBodyHandler,
             Handler<RoutingContext> bodyHandler,
             GracefulShutdownFilter gracefulShutdownFilter, ShutdownConfig shutdownConfig,
@@ -552,7 +553,14 @@ public void handle(HttpServerRequest event) {
             }
             AccessLogHandler handler = new AccessLogHandler(receiver, accessLog.pattern, getClass().getClassLoader(),
                     accessLog.excludePattern);
-            httpRouteRouter.route().order(Integer.MIN_VALUE).handler(handler);
+            if (nonApplicationDedicatedRouter && !nonApplicationAttachedToMainRouter) {
+                // new mainRouter was created nesting both application and non-application routers
+                Router mainRouter = mainRouterRuntimeValue.isPresent() ? mainRouterRuntimeValue.get().getValue()
+                        : Router.router(vertx.get());
+                mainRouter.route().order(Integer.MIN_VALUE).handler(handler);
+            } else {
+                httpRouteRouter.route().order(Integer.MIN_VALUE).handler(handler);
+            }
             quarkusWrapperNeeded = true;
         }