Skip to content

Commit 0b52b25

Browse files
dedalus95dedalus95
committed
fix logging
1 parent 4bdc592 commit 0b52b25

File tree

11 files changed

+43
-41
lines changed

11 files changed

+43
-41
lines changed

‎knowage-api/src/main/resources/log4j2.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<Routes pattern="$${ctx:tenant:-global}">
66
<Route>
77
<RollingFile
8-
name="KNOWAGE_API_${route}"
8+
name="KNOWAGE_API_${ctx:tenant:-global}"
99
append="true"
10-
fileName="${sys:catalina.base}/logs/${route}/knowageApi-${route}.${date:yyyy-MM-dd}.log"
11-
filePattern="${sys:catalina.base}/logs/${route}/knowageApi-${route}.%d{yyyy-MM-dd}.log"
10+
fileName="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageApi.${date:yyyy-MM-dd}.log"
11+
filePattern="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageApi.%d{yyyy-MM-dd}.log"
1212
ignoreExceptions="true"
1313
createOnDemand="true">
1414
<PatternLayout>

‎knowage-spring-boot-api-common/src/main/java/it/eng/knowage/boot/filter/LoggerSetupFilter.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
import java.util.regex.Matcher;
88
import java.util.regex.Pattern;
99

10-
import javax.servlet.Filter;
11-
import javax.servlet.FilterChain;
12-
import javax.servlet.ServletException;
13-
import javax.servlet.ServletRequest;
14-
import javax.servlet.ServletResponse;
10+
import javax.servlet.*;
1511
import javax.servlet.http.HttpServletRequest;
1612
import javax.servlet.http.HttpServletResponse;
1713

@@ -35,7 +31,11 @@ public class LoggerSetupFilter implements Filter {
3531

3632
private static final String THREAD_CONTEXT_KEY_CORRELATION_ID = "correlationId";
3733
private static final String THREAD_CONTEXT_KEY_ENVIRONMENT = "environment";
38-
private static final String THREAD_CONTEXT_KEY_TENANT = "tenant";
34+
35+
@Override
36+
public void init(FilterConfig filterConfig) throws ServletException {
37+
38+
}
3939

4040
@Override
4141
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
@@ -60,6 +60,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
6060

6161
private void preDoFilterForTenant(HttpServletRequest httpRequest) {
6262
String header = httpRequest.getHeader(HTTP_HEADER_X_FORWARDED_HOST);
63+
ThreadContext.put("tenant", "pippo");
6364
if (header != null) {
6465
if (header.contains(",")) {
6566
int iend = header.indexOf(".");
@@ -75,7 +76,6 @@ private void preDoFilterForTenant(HttpServletRequest httpRequest) {
7576
}
7677

7778
ThreadContext.put(THREAD_CONTEXT_KEY_ENVIRONMENT, header);
78-
ThreadContext.put(THREAD_CONTEXT_KEY_TENANT, header);
7979
}
8080
}
8181

@@ -115,7 +115,6 @@ private static void validateCorrelationId(String correlationId) {
115115

116116
private void postDoFilterForTenant() {
117117
ThreadContext.remove(THREAD_CONTEXT_KEY_ENVIRONMENT);
118-
ThreadContext.remove(THREAD_CONTEXT_KEY_TENANT);
119118
}
120119

121120
private void postDoFilterForCorrelationId() {

‎knowage-spring-boot-api-common/src/main/java/it/eng/knowage/boot/filter/bean/KnowageHttpServletRequestWrapper.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import javax.servlet.http.HttpServletRequestWrapper;
77

88
import it.eng.spagobi.services.security.SpagoBIUserProfile;
9+
import org.apache.logging.log4j.ThreadContext;
910

1011
public class KnowageHttpServletRequestWrapper extends HttpServletRequestWrapper {
1112

@@ -15,6 +16,7 @@ public KnowageHttpServletRequestWrapper(HttpServletRequest request, SpagoBIUserP
1516
super(request);
1617

1718
this.principal = new KnowageUserPrincipal(userProfile);
19+
ThreadContext.put("tenant", userProfile.getOrganization());
1820
}
1921

2022
@Override

‎knowage-vue/src/main/resources/log4j2.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<Routes pattern="$${ctx:tenant:-global}">
1111
<Route>
1212
<RollingFile
13-
name="KNOWAGE_VUE_${route}"
13+
name="KNOWAGE_VUE_$${ctx:tenant:-global}"
1414
append="true"
15-
fileName="${sys:catalina.base}/logs/${route}/knowageVue-${route}.${date:yyyy-MM-dd}-%i.log"
16-
filePattern="${sys:catalina.base}/logs/${route}/knowageVue-${route}.${date:yyyy-MM-dd}-%i.log"
15+
fileName="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageVue.${date:yyyy-MM-dd}.log"
16+
filePattern="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageVue.%d{yyyy-MM-dd}-%i.log"
1717
ignoreExceptions="false"
1818
createOnDemand="true">
1919
<PatternLayout>

‎knowagebirtreportengine/src/main/resources/log4j2.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<Routes pattern="$${ctx:tenant:-global}">
66
<Route>
77
<RollingFile
8-
name="KNOWAGE_BIRT_REPORT_ENGINE_${route}"
8+
name="KNOWAGE_BIRT_REPORT_ENGINE_$${ctx:tenant:-global}"
99
append="true"
10-
fileName="${sys:catalina.base}/logs/${route}/knowageBirtReportEngine-${route}.${date:yyyy-MM-dd}.log"
11-
filePattern="${sys:catalina.base}/logs/${route}/knowageBirtReportEngine-${route}.%d{yyyy-MM-dd}.log"
10+
fileName="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageBirtReportEngine.${date:yyyy-MM-dd}.log"
11+
filePattern="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageBirtReportEngine.%d{yyyy-MM-dd}.log"
1212
ignoreExceptions="true"
1313
createOnDemand="true">
1414
<PatternLayout>

‎knowagecockpitengine/src/main/resources/log4j2.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<Routes pattern="$${ctx:tenant:-global}">
66
<Route>
77
<RollingFile
8-
name="KNOWAGE_COCKPIT_ENGINE_${route}"
8+
name="KNOWAGE_COCKPIT_ENGINE_$${ctx:tenant:-global}"
99
append="true"
10-
fileName="${sys:catalina.base}/logs/${route}/knowageCockpitEngine-${route}.${date:yyyy-MM-dd}.log"
11-
filePattern="${sys:catalina.base}/logs/${route}/knowageCockpitEngine-${route}.%d{yyyy-MM-dd}.log"
10+
fileName="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageCockpitEngine.${date:yyyy-MM-dd}.log"
11+
filePattern="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageCockpitEngine.%d{yyyy-MM-dd}.log"
1212
ignoreExceptions="true"
1313
createOnDemand="true">
1414
<PatternLayout>
@@ -43,7 +43,7 @@
4343
<logger name="it.eng.knowage.engine.cockpit.api.export.pdf.nodejs.PdfExporterV2" level="error" additivity="false">
4444
<AppenderRef ref="KNOWAGE_COCKPIT_ENGINE" />
4545
</logger>
46-
<logger name="it.eng.knowage.engine.cockpit.api.export.pdf.nodejs.AbstractNodeJSBasedExporter" level="inferror" additivity="false">
46+
<logger name="it.eng.knowage.engine.cockpit.api.export.pdf.nodejs.AbstractNodeJSBasedExporter" level="error" additivity="false">
4747
<AppenderRef ref="KNOWAGE_COCKPIT_ENGINE" />
4848
</logger>
4949
<logger name="it.eng.knowage.engine.cockpit.api.export.excel.ExcelExporter" level="error" additivity="false">

‎knowagekpiengine/src/main/resources/log4j2.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<Routes pattern="$${ctx:tenant:-global}">
66
<Route>
77
<RollingFile
8-
name="KNOWAGE_KPI_ENGINE_${route}"
8+
name="KNOWAGE_KPI_ENGINE_$${ctx:tenant:-global}"
99
append="true"
10-
fileName="${sys:catalina.base}/logs/${route}/knowageKpiEngine-${route}.${date:yyyy-MM-dd}.log"
11-
filePattern="${sys:catalina.base}/logs/${route}/knowageKpiEngine-${route}.%d{yyyy-MM-dd}.log"
10+
fileName="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageKpiEngine.${date:yyyy-MM-dd}.log"
11+
filePattern="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageKpiEngine.%d{yyyy-MM-dd}.log"
1212
ignoreExceptions="true"
1313
createOnDemand="true">
1414
<PatternLayout>

‎knowagemeta/src/main/resources/log4j2.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<Routes pattern="$${ctx:tenant:-global}">
66
<Route>
77
<RollingFile
8-
name="KNOWAGE_META_${route}"
8+
name="KNOWAGE_META_$${ctx:tenant:-global}"
99
append="true"
10-
fileName="${sys:catalina.base}/logs/${route}/knowageMeta-${route}.${date:yyyy-MM-dd}.log"
11-
filePattern="${sys:catalina.base}/logs/${route}/knowageMeta-${route}.%d{yyyy-MM-dd}.log"
10+
fileName="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageMeta.${date:yyyy-MM-dd}.log"
11+
filePattern="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageMeta.%d{yyyy-MM-dd}.log"
1212
ignoreExceptions="true"
1313
createOnDemand="true">
1414
<PatternLayout>

‎knowageqbeengine/src/main/resources/log4j2.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<Routes pattern="$${ctx:tenant:-global}">
66
<Route>
77
<RollingFile
8-
name="KNOWAGE_QBE_ENGINE_${route}"
8+
name="KNOWAGE_QBE_ENGINE_$${ctx:tenant:-global}"
99
append="true"
10-
fileName="${sys:catalina.base}/logs/${route}/knowageQbeEngine-${route}.${date:yyyy-MM-dd}.log"
11-
filePattern="${sys:catalina.base}/logs/${route}/knowageQbeEngine-${route}.%d{yyyy-MM-dd}.log"
10+
fileName="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageQbeEngine.${date:yyyy-MM-dd}.log"
11+
filePattern="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageQbeEngine.%d{yyyy-MM-dd}.log"
1212
ignoreExceptions="true"
1313
createOnDemand="true">
1414
<PatternLayout>
@@ -26,10 +26,10 @@
2626
<Routes pattern="$${ctx:tenant:-global}">
2727
<Route>
2828
<RollingFile
29-
name="KNOWAGE_QBE_ENGINE_AUDIT_${route}"
29+
name="KNOWAGE_QBE_ENGINE_AUDIT_$${ctx:tenant:-global}"
3030
append="true"
31-
fileName="${sys:catalina.base}/logs/${route}/knowageQbeAudit-${route}.${date:yyyy-MM-dd}.log"
32-
filePattern="${sys:catalina.base}/logs/${route}/knowageQbeAudit-${route}.%d{yyyy-MM-dd}.log"
31+
fileName="${sys:catalina.base}/logs/$${ctx:tenant:-global}/knowageQbeAudit-$${date:yyyy-MM-dd}.log"
32+
filePattern="${sys:catalina.base}/logs/$${ctx:tenant:-global}/knowageQbeAudit-$${ctx:tenant:-global}.%d{yyyy-MM-dd}.log"
3333
ignoreExceptions="true"
3434
createOnDemand="true">
3535
<PatternLayout>

‎knowagetalendengine/src/main/resources/log4j2.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
</PatternLayout>
88
</Console>
99
<RollingFile
10-
name="KNOWAGE_TALEND_ENGINE"
10+
name="KNOWAGE_TALEND_ENGINE_$${ctx:tenant:-global}"
1111
append="true"
12-
filePattern="${sys:catalina.base}/logs/$${ctx:tenant:-global}/knowageTalendEngine-$${ctx:tenant:-global}-%i.log"
12+
fileName="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageTalendEngine.${date:yyyy-MM-dd}.log"
13+
filePattern="${sys:catalina.base}/logs/${ctx:tenant:-global}/knowageTalendEngine.%d{yyyy-MM-dd}.log"
1314
ignoreExceptions="false"
1415
createOnDemand="true">
1516
<PatternLayout>

0 commit comments

Comments
 (0)