From cdc16cfb52271a0e8aa13f19661862641e879db1 Mon Sep 17 00:00:00 2001
From: Alex Martel <13215031+manofthepeace@users.noreply.github.com>
Date: Tue, 29 Aug 2023 10:45:20 -0400
Subject: [PATCH] Adapt for quarkus 3.3+
---
README.md | 14 +-
deployment/pom.xml | 2 +-
.../deployment/LoggingManagerConfig.java | 14 -
.../LoggingManagerOpenAPIFilter.java | 2 +-
.../deployment/LoggingManagerProcessor.java | 302 +-----------------
.../deployment/LoggingManagerUIConfig.java | 22 --
.../resources/template/loggermanager.html | 70 ----
.../template/quarkiverse_icon_reverse.svg | 34 --
.../resources/dev-templates/embedded.html | 11 -
.../deployment/CustomConfigTest.java | 7 +-
.../deployment/CustomHttpRootTest.java | 8 +-
.../deployment/DisabledTest.java | 24 --
.../deployment/ErroneousConfigTest.java | 6 +-
.../deployment/NoConfigTest.java | 8 +-
logstream.gif | Bin 4084719 -> 0 bytes
pom.xml | 4 +-
runtime/pom.xml | 2 +-
.../loggingmanager/LevelHandler.java | 1 -
.../loggingmanager/LogController.java | 125 ++++++++
.../loggingmanager/LoggerHandler.java | 1 -
.../loggingmanager/LoggerManagerRecorder.java | 23 --
.../LoggingManagerRuntimeConfig.java | 7 -
.../LoggingManagerStaticHandler.java | 60 ----
23 files changed, 149 insertions(+), 598 deletions(-)
delete mode 100644 deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerUIConfig.java
delete mode 100644 deployment/src/main/resources/META-INF/resources/template/loggermanager.html
delete mode 100644 deployment/src/main/resources/META-INF/resources/template/quarkiverse_icon_reverse.svg
delete mode 100644 deployment/src/main/resources/dev-templates/embedded.html
delete mode 100644 deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/DisabledTest.java
delete mode 100644 logstream.gif
create mode 100644 runtime/src/main/java/io/quarkiverse/loggingmanager/LogController.java
delete mode 100644 runtime/src/main/java/io/quarkiverse/loggingmanager/LoggingManagerStaticHandler.java
diff --git a/README.md b/README.md
index 991be3c..fb75abc 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@ log level of your loggers.
| Endpoint | Http Method | Description |
| ------------- |:-------------:|:-----:|
-| `/loggers` | `GET` | Returns the list of all loggers, with information about the configured and effective level |
-| `/loggers?loggerName={loggerName}` | `GET` | Returns the logger specified by this name, with information about the configured and effective level |
-| `/loggers` | `POST` | Changes the log level of the specified logger |
-| `/loggers/levels` | `GET` | Get all the available level |
+| `/logging-manager` | `GET` | Returns the list of all loggers, with information about the configured and effective level |
+| `/logging-manager?loggerName={loggerName}` | `GET` | Returns the logger specified by this name, with information about the configured and effective level |
+| `/logging-manager` | `POST` | Changes the log level of the specified logger |
+| `/logging-manager/levels` | `GET` | Get all the available level |
## Security
Security of endpoints is important and we do not want to allow unknown people to know (or worse, change!) the log levels of
@@ -46,10 +46,6 @@ To use this in your application, simply add this in your pom.xml:
Note: Replace `${logger-manager.version}` with the latest version
-Then browse to [http://localhost:8080/q/logging-manager-ui/](http://localhost:8080/q/logging-manager-ui/)
-
-
-
## OpenAPI
You can include the Logger Manager API in the OpenAPI document (and thus also Swagger UI). This needs to be
@@ -64,8 +60,6 @@ This will then add the following to your OpenAPI:
## Roadmap
-- [x] Add online log viewer option
-- [x] Graphical UI to read logger level
- [x] OpenApiSpec for the endpoints
- [x] Make endpoint configurable
- [x] Enable customizable security on the endpoint (see readme file)
diff --git a/deployment/pom.xml b/deployment/pom.xml
index eb8a330..39f9ec5 100644
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -4,7 +4,7 @@
io.quarkiverse.loggingmanager
quarkus-logging-manager-parent
- 3.0.2-SNAPSHOT
+ 3.1.0-SNAPSHOT
../pom.xml
diff --git a/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerConfig.java b/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerConfig.java
index 73aad3f..fd78f92 100644
--- a/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerConfig.java
+++ b/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerConfig.java
@@ -1,6 +1,5 @@
package io.quarkiverse.loggingmanager.deployment;
-import io.quarkus.runtime.annotations.ConfigDocSection;
import io.quarkus.runtime.annotations.ConfigItem;
import io.quarkus.runtime.annotations.ConfigRoot;
@@ -31,17 +30,4 @@ public class LoggingManagerConfig {
*/
@ConfigItem(defaultValue = "true")
boolean alwaysInclude;
-
- /**
- * The number of history log entries to remember.
- */
- @ConfigItem(defaultValue = "50")
- public int historySize;
-
- /**
- * UI configuration
- */
- @ConfigItem
- @ConfigDocSection
- LoggingManagerUIConfig ui;
}
diff --git a/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerOpenAPIFilter.java b/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerOpenAPIFilter.java
index e706a36..4a04530 100644
--- a/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerOpenAPIFilter.java
+++ b/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerOpenAPIFilter.java
@@ -11,7 +11,7 @@
import org.eclipse.microprofile.openapi.models.media.Schema;
import org.eclipse.microprofile.openapi.models.parameters.Parameter;
-import io.quarkus.vertx.http.runtime.logstream.LogController;
+import io.quarkiverse.loggingmanager.LogController;
import io.smallrye.openapi.api.models.media.SchemaImpl;
/**
diff --git a/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerProcessor.java b/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerProcessor.java
index 2bf697e..d94fad1 100644
--- a/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerProcessor.java
+++ b/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerProcessor.java
@@ -1,28 +1,9 @@
package io.quarkiverse.loggingmanager.deployment;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Optional;
import java.util.function.BooleanSupplier;
-import java.util.stream.Stream;
-
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
import io.quarkiverse.loggingmanager.LoggerManagerRecorder;
import io.quarkiverse.loggingmanager.LoggingManagerRuntimeConfig;
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.builder.Version;
-import io.quarkus.builder.item.SimpleBuildItem;
import io.quarkus.deployment.Capabilities;
import io.quarkus.deployment.Capability;
import io.quarkus.deployment.annotations.BuildProducer;
@@ -30,45 +11,18 @@
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
import io.quarkus.deployment.builditem.LaunchModeBuildItem;
-import io.quarkus.deployment.builditem.LogHandlerBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.deployment.configuration.ConfigurationError;
-import io.quarkus.deployment.logging.LogStreamBuildItem;
-import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
-import io.quarkus.deployment.util.IoUtil;
-import io.quarkus.deployment.util.WebJarUtil;
-import io.quarkus.maven.dependency.ResolvedDependency;
-import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.configuration.ConfigurationException;
import io.quarkus.smallrye.openapi.deployment.spi.AddToOpenAPIDefinitionBuildItem;
import io.quarkus.vertx.http.deployment.BodyHandlerBuildItem;
-import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
import io.quarkus.vertx.http.deployment.RouteBuildItem;
-import io.quarkus.vertx.http.runtime.logstream.JsonFormatter;
-import io.quarkus.vertx.http.runtime.logstream.LogStreamRecorder;
-import io.quarkus.vertx.http.runtime.logstream.LogStreamWebSocket;
-import io.quarkus.vertx.http.runtime.logstream.WebSocketLogHandler;
import io.vertx.core.Handler;
import io.vertx.ext.web.RoutingContext;
class LoggingManagerProcessor {
private static final String FEATURE = "logging-manager";
- // For the UI
- private static final String UI_WEBJAR_GROUP_ID = "io.quarkiverse.loggingmanager";
- private static final String UI_WEBJAR_ARTIFACT_ID = "quarkus-logging-manager";
-
- private static final String UI_FINAL_DESTINATION = "META-INF/logging-manager-files";
-
- private static final String STATIC_RESOURCE_FOLDER = "dev-static/";
- private static final String INDEX_HTML = "index.html";
- private static final String LOGO_SVG = "quarkiverse_icon_reverse.svg";
-
- private final Config config = ConfigProvider.getConfig();
-
static class OpenAPIIncluded implements BooleanSupplier {
LoggingManagerConfig config;
@@ -92,6 +46,11 @@ void includeRestEndpoints(BuildProducer routeProducer,
LaunchModeBuildItem launchMode,
LoggingManagerRuntimeConfig runtimeConfig) {
+ if ("/".equals(loggingManagerConfig.basePath)) {
+ throw new ConfigurationException(
+ "quarkus.logging-manager.base-path was set to \"/\", this is not allowed as it blocks the application from serving anything else.");
+ }
+
if (shouldInclude(launchMode, loggingManagerConfig)) {
Handler loggerHandler = recorder.loggerHandler();
Handler levelHandler = recorder.levelHandler();
@@ -127,257 +86,8 @@ public void includeInOpenAPIEndpoint(BuildProducer annotatedProducer,
- BuildProducer routeProducer,
- BuildProducer loggingManagerBuildProducer,
- BuildProducer logStreamBuildProducer,
- HttpRootPathBuildItem httpRootPathBuildItem,
- NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
- BuildProducer generatedResourceProducer,
- BuildProducer nativeImageResourceProducer,
- CurateOutcomeBuildItem curateOutcomeBuildItem,
- LaunchModeBuildItem launchMode,
- LoggingManagerConfig loggingManagerConfig) throws Exception {
-
- if ("/".equals(loggingManagerConfig.ui.rootPath)) {
- throw new ConfigurationError(
- "quarkus.logging-manager.ui.root-path was set to \"/\", this is not allowed as it blocks the application from serving anything else.");
- }
-
- ResolvedDependency resolvedDependency = WebJarUtil.getAppArtifact(curateOutcomeBuildItem, UI_WEBJAR_GROUP_ID,
- UI_WEBJAR_ARTIFACT_ID);
- ResolvedDependency userApplication = curateOutcomeBuildItem.getApplicationModel().getAppArtifact();
-
- String uiPath = nonApplicationRootPathBuildItem.resolvePath(loggingManagerConfig.ui.rootPath);
-
- if (launchMode.getLaunchMode().isDevOrTest()) {
- // The static resources
- Path tempPath = WebJarUtil.createResourcesDirectory(userApplication, resolvedDependency);
-
- Path indexHtml = Paths.get(tempPath.toString(), INDEX_HTML);
- if (!Files.exists(indexHtml)) {
- Files.createFile(indexHtml);
- }
- String indexHtmlContent = getIndexHtmlContents(nonApplicationRootPathBuildItem.getNonApplicationRootPath(),
- "/dev-v1/logstream");
-
- Files.write(indexHtml, indexHtmlContent.getBytes());
-
- Path logoSvg = Paths.get(tempPath.toString(), LOGO_SVG);
- if (!Files.exists(logoSvg)) {
- Files.createFile(logoSvg);
- }
- byte[] logo = getLogo();
- Files.write(logoSvg, logo);
-
- loggingManagerBuildProducer
- .produce(new LoggingManagerBuildItem(tempPath.toAbsolutePath().toString(), uiPath));
-
- } else if (loggingManagerConfig.ui.alwaysInclude) {
- // Indicate that we need this in production
- logStreamBuildProducer.produce(new LogStreamBuildItem());
-
- // Make sure the WebSocket gets included.
- annotatedProducer.produce(AdditionalBeanBuildItem.unremovableOf(LogStreamWebSocket.class));
- annotatedProducer.produce(AdditionalBeanBuildItem.unremovableOf(WebSocketLogHandler.class));
-
- // Get the index.html
- String indexHtmlContent = getIndexHtmlContents(nonApplicationRootPathBuildItem.getNonApplicationRootPath(),
- "/" + loggingManagerConfig.basePath + "/logstream");
- // Update the resource Url to be relative
- String pathToBeReplaced = nonApplicationRootPathBuildItem.resolvePath("dev-v1/resources");
- indexHtmlContent = indexHtmlContent.replaceAll(pathToBeReplaced + "/", "");
- String indexHtmlFileName = UI_FINAL_DESTINATION + "/" + INDEX_HTML;
- generatedResourceProducer.produce(new GeneratedResourceBuildItem(indexHtmlFileName, indexHtmlContent.getBytes()));
- nativeImageResourceProducer.produce(new NativeImageResourceBuildItem(indexHtmlFileName));
-
- // Get the logo
- byte[] logo = getLogo();
- String logoFileName = UI_FINAL_DESTINATION + "/" + LOGO_SVG;
-
- generatedResourceProducer.produce(new GeneratedResourceBuildItem(logoFileName, logo));
- nativeImageResourceProducer.produce(new NativeImageResourceBuildItem(logoFileName));
-
- addStaticResource(generatedResourceProducer, nativeImageResourceProducer);
-
- loggingManagerBuildProducer.produce(new LoggingManagerBuildItem(UI_FINAL_DESTINATION, uiPath));
- }
- }
-
- @BuildStep
- @Record(ExecutionTime.STATIC_INIT)
- public HistoryHandlerBuildItem hander(BuildProducer logHandlerBuildItemBuildProducer,
- LogStreamRecorder recorder,
- LoggingManagerConfig loggingManagerConfig,
- LaunchModeBuildItem launchMode) {
-
- RuntimeValue> handler = recorder.logHandler(loggingManagerConfig.historySize);
- if (!launchMode.getLaunchMode().isDevOrTest() && loggingManagerConfig.ui.alwaysInclude) {
- logHandlerBuildItemBuildProducer.produce(new LogHandlerBuildItem((RuntimeValue) handler));
- }
- return new HistoryHandlerBuildItem(handler);
- }
-
- @BuildStep
- @Record(ExecutionTime.RUNTIME_INIT)
- void registerLoggingManagerUiHandler(
- BuildProducer routeProducer,
- BuildProducer reflectiveClassProducer,
- NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
- LoggerManagerRecorder recorder,
- HistoryHandlerBuildItem historyHandlerBuildItem,
- LoggingManagerRuntimeConfig runtimeConfig,
- LoggingManagerBuildItem loggingManagerBuildItem,
- LaunchModeBuildItem launchMode,
- LoggingManagerConfig loggingManagerConfig) throws Exception {
-
- if (shouldIncludeUi(launchMode, loggingManagerConfig)) {
- Handler handler = recorder.uiHandler(loggingManagerBuildItem.getLoggingManagerFinalDestination(),
- loggingManagerBuildItem.getLoggingManagerPath(), runtimeConfig);
-
- routeProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
- .route(loggingManagerConfig.ui.rootPath)
- .handler(handler)
- .displayOnNotFoundPage("Quarkus Logging manager")
- .build());
- routeProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
- .route(loggingManagerConfig.ui.rootPath + "/*")
- .handler(handler)
- .build());
-
- // Add the log stream (In dev mode, the stream is already available at /dev-v1/logstream)
- if (!launchMode.getLaunchMode().isDevOrTest() && loggingManagerConfig.ui.alwaysInclude) {
-
- reflectiveClassProducer.produce(new ReflectiveClassBuildItem(true, true,
- LogStreamWebSocket.class,
- WebSocketLogHandler.class,
- LogStreamWebSocket.class,
- JsonFormatter.class));
-
- Handler logStreamWebSocketHandler = recorder.logStreamWebSocketHandler(runtimeConfig,
- historyHandlerBuildItem.value);
-
- routeProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
- .nestedRoute(loggingManagerConfig.basePath, "logstream")
- .handler(logStreamWebSocketHandler)
- .build());
- }
- }
- }
-
- private byte[] getLogo() throws IOException {
- try (InputStream logo = LoggingManagerProcessor.class.getClassLoader()
- .getResourceAsStream("META-INF/resources/template/" + LOGO_SVG)) {
- return IoUtil.readBytes(logo);
- }
- }
-
- private String getIndexHtmlContents(String nonApplicationRootPath, String streamingPath) throws IOException {
- // Get the loggermanager html resources from Dev UI
- try (InputStream nav = LoggingManagerProcessor.class.getClassLoader()
- .getResourceAsStream("dev-templates/logmanagerNav.html");
- InputStream log = LoggingManagerProcessor.class.getClassLoader()
- .getResourceAsStream("dev-templates/logmanagerLog.html");
- InputStream modals = LoggingManagerProcessor.class.getClassLoader()
- .getResourceAsStream("dev-templates/logmanagerModals.html")) {
-
- String navContent = new String(IoUtil.readBytes(nav));
- String logContent = new String(IoUtil.readBytes(log));
- String modalsContent = new String(IoUtil.readBytes(modals));
-
- try (InputStream index = LoggingManagerProcessor.class.getClassLoader()
- .getResourceAsStream("META-INF/resources/template/loggermanager.html")) {
-
- String indexHtmlContent = new String(IoUtil.readBytes(index));
-
- // Add the terminal (might contain vars)
- indexHtmlContent = indexHtmlContent.replaceAll("\\{navContent}",
- navContent);
- indexHtmlContent = indexHtmlContent.replaceAll("\\{logContent}",
- logContent);
- indexHtmlContent = indexHtmlContent.replaceAll("\\{modalsContent}",
- modalsContent);
-
- // Make sure the non apllication path and streaming path is replaced
- indexHtmlContent = indexHtmlContent.replaceAll("\\{frameworkRootPath}",
- cleanFrameworkRootPath(nonApplicationRootPath));
-
- indexHtmlContent = indexHtmlContent.replaceAll("\\{devRootAppend}",
- cleanFrameworkRootPath(nonApplicationRootPath) + "/dev-v1");
-
- indexHtmlContent = indexHtmlContent.replaceAll("\\{streamingPath}",
- streamingPath);
-
- // Make sure the application name and version is replaced
- indexHtmlContent = indexHtmlContent.replaceAll("\\{applicationName}",
- config.getOptionalValue("quarkus.application.name", String.class).orElse(""));
- indexHtmlContent = indexHtmlContent.replaceAll("\\{applicationVersion}",
- config.getOptionalValue("quarkus.application.version", String.class).orElse(""));
- indexHtmlContent = indexHtmlContent.replaceAll("\\{quarkusVersion}",
- Version.getVersion());
-
- return indexHtmlContent;
- }
- }
- }
-
- /**
- * This removes the last / from the path
- *
- * @param p the path
- * @return the path without the last /
- */
- private String cleanFrameworkRootPath(String p) {
- if (p != null && !p.isEmpty() && p.endsWith("/")) {
- return p.substring(0, p.length() - 1);
- }
- return p;
- }
-
- private void addStaticResource(BuildProducer generatedResourceProducer,
- BuildProducer nativeImageResourceProducer) throws IOException, URISyntaxException {
-
- FileSystem fileSystem = getFileSystem();
- Path myPath = fileSystem.getPath(STATIC_RESOURCE_FOLDER);
-
- Stream walk = Files.walk(myPath, 5);
- for (Iterator it = walk.iterator(); it.hasNext();) {
- Path staticResource = it.next();
- if (!Files.isDirectory(staticResource) && Files.isRegularFile(staticResource)) {
- String fileName = UI_FINAL_DESTINATION + "/"
- + staticResource.toString().substring(STATIC_RESOURCE_FOLDER.length());
- byte[] content = Files.readAllBytes(staticResource);
- generatedResourceProducer.produce(new GeneratedResourceBuildItem(fileName, content));
- nativeImageResourceProducer.produce(new NativeImageResourceBuildItem(fileName));
- }
- }
- }
-
- private FileSystem getFileSystem() throws URISyntaxException, IOException {
- URI uri = null;
- try {
- uri = LoggingManagerProcessor.class.getClassLoader().getResource(STATIC_RESOURCE_FOLDER).toURI();
- return FileSystems.newFileSystem(uri, Collections. emptyMap());
- } catch (java.nio.file.FileSystemAlreadyExistsException ex) {
- return FileSystems.getFileSystem(uri);
- }
- }
-
- private static boolean shouldIncludeUi(LaunchModeBuildItem launchMode, LoggingManagerConfig loggingManagerConfig) {
- return launchMode.getLaunchMode().isDevOrTest() || loggingManagerConfig.ui.alwaysInclude;
- }
-
private static boolean shouldInclude(LaunchModeBuildItem launchMode, LoggingManagerConfig loggingManagerConfig) {
return launchMode.getLaunchMode().isDevOrTest() || loggingManagerConfig.alwaysInclude;
}
- public static final class HistoryHandlerBuildItem extends SimpleBuildItem {
- final RuntimeValue> value;
-
- public HistoryHandlerBuildItem(RuntimeValue> value) {
- this.value = value;
- }
- }
}
diff --git a/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerUIConfig.java b/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerUIConfig.java
deleted file mode 100644
index f93b877..0000000
--- a/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerUIConfig.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.quarkiverse.loggingmanager.deployment;
-
-import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
-
-@ConfigGroup
-public class LoggingManagerUIConfig {
-
- /**
- * The path where Logging Manager is available.
- * The value `/` is not allowed as it blocks the application from serving anything else.
- */
- @ConfigItem(defaultValue = "logging-manager-ui")
- String rootPath;
-
- /**
- * Always include the UI. By default this will only be included in dev and test.
- * Setting this to true will also include the UI in Prod
- */
- @ConfigItem(defaultValue = "false")
- boolean alwaysInclude;
-}
diff --git a/deployment/src/main/resources/META-INF/resources/template/loggermanager.html b/deployment/src/main/resources/META-INF/resources/template/loggermanager.html
deleted file mode 100644
index 41d64b2..0000000
--- a/deployment/src/main/resources/META-INF/resources/template/loggermanager.html
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Logging manager | {applicationName} {applicationVersion}
-
-
-
-
-
-
-
-
- {logContent}
- {modalsContent}
-
-
-
-
-
-
-
diff --git a/deployment/src/main/resources/META-INF/resources/template/quarkiverse_icon_reverse.svg b/deployment/src/main/resources/META-INF/resources/template/quarkiverse_icon_reverse.svg
deleted file mode 100644
index 1c93f74..0000000
--- a/deployment/src/main/resources/META-INF/resources/template/quarkiverse_icon_reverse.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-
diff --git a/deployment/src/main/resources/dev-templates/embedded.html b/deployment/src/main/resources/dev-templates/embedded.html
deleted file mode 100644
index e0d2543..0000000
--- a/deployment/src/main/resources/dev-templates/embedded.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- Logging manager UI
-
-{#if config:property('quarkus.logging-manager.openapi.included') == 'true'}
-
-
- Spec in Swagger UI
-{/if}
-
-
diff --git a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/CustomConfigTest.java b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/CustomConfigTest.java
index 4503724..1b4b10a 100644
--- a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/CustomConfigTest.java
+++ b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/CustomConfigTest.java
@@ -1,7 +1,5 @@
package io.quarkiverse.loggingmanager.deployment;
-import static org.hamcrest.Matchers.containsString;
-
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -16,11 +14,10 @@ public class CustomConfigTest {
@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
- .addAsResource(new StringAsset("quarkus.logging-manager.ui.root-path=custom"), "application.properties"));
+ .addAsResource(new StringAsset("quarkus.logging-manager.base-path=custom"), "application.properties"));
@Test
public void shouldUseCustomConfig() {
- RestAssured.when().get("/q/custom").then().statusCode(200).body(containsString("Logging manager"));
- RestAssured.when().get("/q/custom/index.html").then().statusCode(200).body(containsString("Logging manager"));
+ RestAssured.when().get("/q/custom").then().statusCode(200);
}
}
diff --git a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/CustomHttpRootTest.java b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/CustomHttpRootTest.java
index 0013556..62b6203 100644
--- a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/CustomHttpRootTest.java
+++ b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/CustomHttpRootTest.java
@@ -1,7 +1,5 @@
package io.quarkiverse.loggingmanager.deployment;
-import static org.hamcrest.Matchers.containsString;
-
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -20,8 +18,6 @@ public class CustomHttpRootTest {
@Test
public void shouldUseCustomConfig() {
- RestAssured.when().get("/q/logging-manager-ui").then().statusCode(200).body(containsString("Logging manager"));
- RestAssured.when().get("/q/logging-manager-ui/index.html").then().statusCode(200)
- .body(containsString("Logging manager"));
+ RestAssured.when().get("/q/logging-manager").then().statusCode(200);
}
-}
\ No newline at end of file
+}
diff --git a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/DisabledTest.java b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/DisabledTest.java
deleted file mode 100644
index b9854d4..0000000
--- a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/DisabledTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkiverse.loggingmanager.deployment;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusUnitTest;
-import io.restassured.RestAssured;
-
-public class DisabledTest {
-
- @RegisterExtension
- static final QuarkusUnitTest config = new QuarkusUnitTest()
- .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
- .addAsResource(new StringAsset("quarkus.logging-manager.ui.enable=false"), "application.properties"));
-
- @Test
- public void shouldUseDefaultConfig() {
- RestAssured.when().get("/q/logging-manager-ui").then().statusCode(404);
- RestAssured.when().get("/q/logging-manager-ui/index.html").then().statusCode(404);
- }
-}
diff --git a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/ErroneousConfigTest.java b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/ErroneousConfigTest.java
index e2b110e..43d9fa8 100644
--- a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/ErroneousConfigTest.java
+++ b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/ErroneousConfigTest.java
@@ -7,16 +7,16 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import io.quarkus.deployment.configuration.ConfigurationError;
+import io.quarkus.runtime.configuration.ConfigurationException;
import io.quarkus.test.QuarkusUnitTest;
public class ErroneousConfigTest {
@RegisterExtension
static final QuarkusUnitTest config = new QuarkusUnitTest()
- .setExpectedException(ConfigurationError.class)
+ .setExpectedException(ConfigurationException.class)
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
- .addAsResource(new StringAsset("quarkus.logging-manager.ui.root-path=/\n"), "application.properties"));
+ .addAsResource(new StringAsset("quarkus.logging-manager.base-path=/\n"), "application.properties"));
@Test
public void shouldNotStartApplicationIfPathIsASlash() {
diff --git a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/NoConfigTest.java b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/NoConfigTest.java
index b1abcce..dba5328 100644
--- a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/NoConfigTest.java
+++ b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/NoConfigTest.java
@@ -1,7 +1,5 @@
package io.quarkiverse.loggingmanager.deployment;
-import static org.hamcrest.Matchers.containsString;
-
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
@@ -18,8 +16,6 @@ public class NoConfigTest {
@Test
public void shouldUseDefaultConfig() {
- RestAssured.when().get("/q/logging-manager-ui").then().statusCode(200).body(containsString("Logging manager"));
- RestAssured.when().get("/q/logging-manager-ui/index.html").then().statusCode(200)
- .body(containsString("Logging manager"));
+ RestAssured.when().get("/q/logging-manager").then().statusCode(200);
}
-}
\ No newline at end of file
+}
diff --git a/logstream.gif b/logstream.gif
deleted file mode 100644
index 0252a286fe2b894a3241a310357305e90d0519aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4084719
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