From 6cc7e03f5a6a80653c98ad5bd41ef6b042fe1c6f Mon Sep 17 00:00:00 2001 From: rschoene <rene.schoene@tu-dresden.de> Date: Wed, 9 Feb 2022 11:55:38 +0100 Subject: [PATCH] working on slf4j debug messages - fix docu - rearrange definition of logConsoleOut/Err to match usage in template --- pages/docs/compiler.md | 2 +- ragconnect.base/src/main/jastadd/Intermediate.jadd | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pages/docs/compiler.md b/pages/docs/compiler.md index 4f5e191..d60822b 100644 --- a/pages/docs/compiler.md +++ b/pages/docs/compiler.md @@ -94,7 +94,7 @@ However, depending on the selected protocols and/or used features, additional de ### Logging Target SLF4J -- Condition: When using `--loggingTarget=slf4j` to RagConnect +- Condition: When using `--logTarget=slf4j` to RagConnect - Required runtime dependencies: - `group: 'org.slf4j', name: 'slf4j-api', version: '1.7.0'` - Required options for RelAST compiler: _none_ diff --git a/ragconnect.base/src/main/jastadd/Intermediate.jadd b/ragconnect.base/src/main/jastadd/Intermediate.jadd index 196e129..5ca17cd 100644 --- a/ragconnect.base/src/main/jastadd/Intermediate.jadd +++ b/ragconnect.base/src/main/jastadd/Intermediate.jadd @@ -34,8 +34,6 @@ aspect SharedMustache { return "?"; } } - syn String RagConnect.logConsoleOut() = internalRagConnectPrefix() + "logStdOut"; - syn String RagConnect.logConsoleErr() = internalRagConnectPrefix() + "logStdErr"; syn String RagConnect.observerInstanceSingletonMethodName() = internalRagConnectPrefix() + "Observer"; syn String RagConnect.observerInstanceResetMethodName() = internalRagConnectPrefix() + "resetObserver"; @@ -282,6 +280,9 @@ aspect MustacheRagConnect { syn String RagConnect.observerInstanceFieldName() = internalRagConnectPrefix() + "ObserverInstance"; + syn String RagConnect.logConsoleOut() = internalRagConnectPrefix() + "logStdOut"; + syn String RagConnect.logConsoleErr() = internalRagConnectPrefix() + "logStdErr"; + syn java.util.List<Component> TypeDecl.tokenComponents() { return filteredComponents(Component::isTokenComponent); } -- GitLab