This is an automated email from the ASF dual-hosted git repository.
jkevan pushed a commit to branch securityLog
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/securityLog by this push:
new 071b4a5 improve logs to use formating instead of string concatenation
071b4a5 is described below
commit 071b4a5092411bae9bb903a0c25421f630beef4c
Author: Kevan <[email protected]>
AuthorDate: Tue Mar 23 10:14:10 2021 +0100
improve logs to use formating instead of string concatenation
---
.../apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java | 2 +-
.../baseplugin/conditions/BooleanConditionESQueryBuilder.java | 4 ++--
.../plugins/baseplugin/conditions/PropertyConditionEvaluator.java | 6 +++---
.../unomi/plugins/request/actions/SetRemoteHostInfoAction.java | 4 ++--
.../src/main/java/org/apache/unomi/rest/ClusterServiceEndPoint.java | 2 +-
wab/src/main/java/org/apache/unomi/web/ContextServlet.java | 2 +-
wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
index 01e17c7..6bbc9d8 100644
---
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
+++
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
@@ -95,7 +95,7 @@ public class SetPropertyAction implements ActionExecutor {
} catch (ParseException e) {
logger.error("Error parsing firstVisit date property. See
debug log level for more information");
if (logger.isDebugEnabled()) {
- logger.debug("Error parsing date: " + propertyFirstVisit,
e);
+ logger.debug("Error parsing date: {}", propertyFirstVisit,
e);
}
}
diff --git
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/BooleanConditionESQueryBuilder.java
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/BooleanConditionESQueryBuilder.java
index 0161c33..b27c5ef 100644
---
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/BooleanConditionESQueryBuilder.java
+++
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/BooleanConditionESQueryBuilder.java
@@ -62,7 +62,7 @@ public class BooleanConditionESQueryBuilder implements
ConditionESQueryBuilder {
} else {
logger.warn("Null filter for boolean AND sub condition.
See debug log level for more information");
if (logger.isDebugEnabled()) {
- logger.debug("Null filter for boolean AND sub
condition " + conditions.get(i));
+ logger.debug("Null filter for boolean AND sub
condition {}", conditions.get(i));
}
}
} else {
@@ -72,7 +72,7 @@ public class BooleanConditionESQueryBuilder implements
ConditionESQueryBuilder {
} else {
logger.warn("Null filter for boolean OR sub condition. See
debug log level for more information");
if (logger.isDebugEnabled()) {
- logger.debug("Null filter for boolean OR sub condition
" + conditions.get(i));
+ logger.debug("Null filter for boolean OR sub condition
{}", conditions.get(i));
}
}
}
diff --git
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
index 23ec2aa..8b6faca 100644
---
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
+++
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
@@ -185,9 +185,9 @@ public class PropertyConditionEvaluator implements
ConditionEvaluator {
if (!(e instanceof OgnlException)
|| (!StringUtils.startsWith(e.getMessage(),
"source is null for getProperty(null"))) {
- logger.warn("Error evaluating value for " +
item.getClass().getName() + " " + name + ". See debug level for more
information");
+ logger.warn("Error evaluating value for {} {}. See debug
level for more information", item.getClass().getName(), name);
if (logger.isDebugEnabled()) {
- logger.debug("Error evaluating value for " +
item.getClass().getName() + " " + name, e);
+ logger.debug("Error evaluating value for {} {}",
item.getClass().getName(), name, e);
}
}
actualValue = null;
@@ -440,7 +440,7 @@ public class PropertyConditionEvaluator implements
ConditionEvaluator {
} catch (ElasticsearchParseException e) {
logger.warn("unable to parse date. See debug log level for
full stacktrace");
if (logger.isDebugEnabled()) {
- logger.debug("unable to parse date " + value.toString(),
e);
+ logger.debug("unable to parse date {}", value.toString(),
e);
}
}
}
diff --git
a/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/SetRemoteHostInfoAction.java
b/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/SetRemoteHostInfoAction.java
index 6c68371..58527fe 100644
---
a/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/SetRemoteHostInfoAction.java
+++
b/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/SetRemoteHostInfoAction.java
@@ -234,7 +234,7 @@ public class SetRemoteHostInfoAction implements
ActionExecutor {
} catch (IOException | GeoIp2Exception e) {
logger.warn("Cannot resolve IP, enable debug log level for
complete stacktrace");
if (logger.isDebugEnabled()) {
- logger.debug("Cannot resolve IP: " + remoteAddr, e);
+ logger.debug("Cannot resolve IP: {}", remoteAddr, e);
}
}
return false;
@@ -248,7 +248,7 @@ public class SetRemoteHostInfoAction implements
ActionExecutor {
} catch (UnknownHostException e) {
logger.warn("Cannot resolve IP, enable debug log level for
complete stacktrace");
if (logger.isDebugEnabled()) {
- logger.debug("Cannot resolve IP: " + remoteAddr, e);
+ logger.debug("Cannot resolve IP: {}", remoteAddr, e);
}
return false;
}
diff --git
a/rest/src/main/java/org/apache/unomi/rest/ClusterServiceEndPoint.java
b/rest/src/main/java/org/apache/unomi/rest/ClusterServiceEndPoint.java
index 3de2c71..9f26c7d 100644
--- a/rest/src/main/java/org/apache/unomi/rest/ClusterServiceEndPoint.java
+++ b/rest/src/main/java/org/apache/unomi/rest/ClusterServiceEndPoint.java
@@ -93,7 +93,7 @@ public class ClusterServiceEndPoint {
} catch (ParseException e) {
logger.error("Cannot parse date, expected format is: yyyy-MM-dd.
See debug log level for more information");
if (logger.isDebugEnabled()) {
- logger.debug("Cannot parse date " + date, e);
+ logger.debug("Cannot parse date: {}", date, e);
}
}
}
diff --git a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
index 18d46a9..2c37611 100644
--- a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
@@ -127,7 +127,7 @@ public class ContextServlet extends HttpServlet {
((HttpServletResponse)response).sendError(HttpServletResponse.SC_BAD_REQUEST,
"Check logs for more details");
logger.error("Cannot deserialize the context request
payload. See debug level for more information");
if (logger.isDebugEnabled()) {
- logger.debug("Cannot deserialize the context request
payload: " + stringPayload, e);
+ logger.debug("Cannot deserialize the context request
payload: {}", stringPayload, e);
}
return;
}
diff --git a/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
b/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
index aecaee1..5bca92d 100644
--- a/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
@@ -123,7 +123,7 @@ public class EventsCollectorServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Check logs
for more details");
logger.error("Cannot read payload. See debug level for more
information");
if (logger.isDebugEnabled()) {
- logger.debug("Cannot read payload: " + payload, e);
+ logger.debug("Cannot read payload: {}", payload, e);
}
return;
}
