You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/10/23 09:47:14 UTC
[shardingsphere-elasticjob] branch master updated: Revise
error-handel log level (#1649)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new 12b593f Revise error-handel log level (#1649)
12b593f is described below
commit 12b593ff646236c548aa16bd97d4fcc9654904fc
Author: Yanjie Zhou <zh...@aliyun.com>
AuthorDate: Fri Oct 23 17:47:01 2020 +0800
Revise error-handel log level (#1649)
---
.../error/handler/dingtalk/DingtalkJobErrorHandler.java | 8 ++++----
.../error/handler/dingtalk/DingtalkJobErrorHandlerTest.java | 10 +++++-----
.../elasticjob/error/handler/email/EmailJobErrorHandler.java | 2 +-
.../error/handler/email/EmailJobErrorHandlerTest.java | 2 +-
.../elasticjob/error/handler/wechat/WechatJobErrorHandler.java | 8 ++++----
.../error/handler/wechat/WechatJobErrorHandlerTest.java | 8 ++++----
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
index 8ab1f76..dceaa32 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
@@ -95,16 +95,16 @@ public final class DingtalkJobErrorHandler implements JobErrorHandler {
if (HttpURLConnection.HTTP_OK == status) {
JsonObject responseMessage = GsonFactory.getGson().fromJson(EntityUtils.toString(response.getEntity()), JsonObject.class);
if (!"0".equals(responseMessage.get("errcode").getAsString())) {
- log.info("An exception has occurred in Job '{}', But failed to send alert by Dingtalk because of: {}", jobName, responseMessage.get("errmsg").getAsString(), cause);
+ log.error("An exception has occurred in Job '{}' but failed to send dingtalk because of: {}", jobName, responseMessage.get("errmsg").getAsString(), cause);
} else {
- log.info("An exception has occurred in Job '{}', Notification to Dingtalk was successful.", jobName, cause);
+ log.info("An exception has occurred in Job '{}', an dingtalk message been sent successful.", jobName, cause);
}
} else {
- log.error("An exception has occurred in Job '{}', But failed to send alert by Dingtalk because of: Unexpected response status: {}", jobName, status, cause);
+ log.error("An exception has occurred in Job '{}' but failed to send dingtalk because of: unexpected http response status: {}", jobName, status, cause);
}
} catch (final IOException ex) {
cause.addSuppressed(ex);
- log.error("An exception has occurred in Job '{}', But failed to send alert by Dingtalk because of", jobName, cause);
+ log.error("An exception has occurred in Job '{}', but failed to send dingtalk because of", jobName, cause);
}
}
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java
index 60b6501..6d4b787 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java
@@ -72,7 +72,7 @@ public final class DingtalkJobErrorHandlerTest {
setStaticFieldValue(actual);
Throwable cause = new RuntimeException("test");
actual.handleException("test_job", cause);
- verify(log).info("An exception has occurred in Job '{}', Notification to Dingtalk was successful.", "test_job", cause);
+ verify(log).info("An exception has occurred in Job '{}', an dingtalk message been sent successful.", "test_job", cause);
}
@Test
@@ -81,7 +81,7 @@ public final class DingtalkJobErrorHandlerTest {
setStaticFieldValue(actual);
Throwable cause = new RuntimeException("test");
actual.handleException("test_job", cause);
- verify(log).info("An exception has occurred in Job '{}', But failed to send alert by Dingtalk because of: {}", "test_job", "token is not exist", cause);
+ verify(log).error("An exception has occurred in Job '{}' but failed to send dingtalk because of: {}", "test_job", "token is not exist", cause);
}
@Test
@@ -90,7 +90,7 @@ public final class DingtalkJobErrorHandlerTest {
setStaticFieldValue(actual);
Throwable cause = new RuntimeException("test");
actual.handleException("test_job", cause);
- verify(log).error("An exception has occurred in Job '{}', But failed to send alert by Dingtalk because of: Unexpected response status: {}", "test_job", 404, cause);
+ verify(log).error("An exception has occurred in Job '{}' but failed to send dingtalk because of: unexpected http response status: {}", "test_job", 404, cause);
}
@Test
@@ -99,7 +99,7 @@ public final class DingtalkJobErrorHandlerTest {
setStaticFieldValue(actual);
Throwable cause = new RuntimeException("test");
actual.handleException("test_job", cause);
- verify(log).error("An exception has occurred in Job '{}', But failed to send alert by Dingtalk because of", "test_job", cause);
+ verify(log).error("An exception has occurred in Job '{}', but failed to send dingtalk because of", "test_job", cause);
}
@Test
@@ -108,7 +108,7 @@ public final class DingtalkJobErrorHandlerTest {
setStaticFieldValue(actual);
Throwable cause = new RuntimeException("test");
actual.handleException("test_job", cause);
- verify(log).info("An exception has occurred in Job '{}', Notification to Dingtalk was successful.", "test_job", cause);
+ verify(log).info("An exception has occurred in Job '{}', an dingtalk message been sent successful.", "test_job", cause);
}
private DingtalkJobErrorHandler getDingtalkJobErrorHandler(final Properties props) {
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java
index 5b7a715..32411a9 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java
@@ -102,7 +102,7 @@ public final class EmailJobErrorHandler implements JobErrorHandler {
String errorMessage = getErrorMessage(jobName, cause);
try {
sendMessage(createMessage(errorMessage));
- log.error("An exception has occurred in Job '{}'. An email has been sent successfully.", jobName, cause);
+ log.info("An exception has occurred in Job '{}', an email has been sent successfully.", jobName, cause);
} catch (final MessagingException ex) {
cause.addSuppressed(ex);
log.error("An exception has occurred in Job '{}' but failed to send email because of", jobName, cause);
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java
index 8e6b8ba..7ade63f 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java
@@ -72,7 +72,7 @@ public final class EmailJobErrorHandlerTest {
when(session.getTransport()).thenReturn(transport);
emailJobErrorHandler.handleException(jobName, cause);
verify(transport).sendMessage(any(Message.class), any(Address[].class));
- verify(log).error("An exception has occurred in Job '{}'. An email has been sent successfully.", jobName, cause);
+ verify(log).info("An exception has occurred in Job '{}', an email has been sent successfully.", jobName, cause);
}
private EmailJobErrorHandler getEmailJobErrorHandler(final Properties props) {
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
index 84ac6a7..07babb6 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
@@ -81,16 +81,16 @@ public final class WechatJobErrorHandler implements JobErrorHandler {
if (HttpURLConnection.HTTP_OK == status) {
JsonObject resp = GsonFactory.getGson().fromJson(EntityUtils.toString(response.getEntity()), JsonObject.class);
if (!"0".equals(resp.get("errcode").getAsString())) {
- log.info("An exception has occurred in Job '{}', But failed to send alert by wechat because of: {}", jobName, resp.get("errmsg").getAsString(), cause);
+ log.error("An exception has occurred in Job '{}' but failed to send wechat because of: {}", jobName, resp.get("errmsg").getAsString(), cause);
} else {
- log.info("An exception has occurred in Job '{}', Notification to wechat was successful.", jobName, cause);
+ log.info("An exception has occurred in Job '{}', an wechat message has been sent successful.", jobName, cause);
}
} else {
- log.error("An exception has occurred in Job '{}', But failed to send alert by wechat because of: Unexpected response status: {}", jobName, status, cause);
+ log.error("An exception has occurred in Job '{}' but failed to send wechat because of: unexpected http response status: {}", jobName, status, cause);
}
} catch (final IOException ex) {
cause.addSuppressed(ex);
- log.error("An exception has occurred in Job '{}', But failed to send alert by wechat because of", jobName, cause);
+ log.error("An exception has occurred in Job '{}' but failed to send wechat because of", jobName, cause);
}
}
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java
index a5a86a9..db227e1 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java
@@ -72,7 +72,7 @@ public final class WechatJobErrorHandlerTest {
setStaticFieldValue(actual);
Throwable cause = new RuntimeException("test");
actual.handleException("test_job", cause);
- verify(log).info("An exception has occurred in Job '{}', Notification to wechat was successful.", "test_job", cause);
+ verify(log).info("An exception has occurred in Job '{}', an wechat message has been sent successful.", "test_job", cause);
}
@Test
@@ -81,7 +81,7 @@ public final class WechatJobErrorHandlerTest {
setStaticFieldValue(actual);
Throwable cause = new RuntimeException("test");
actual.handleException("test_job", cause);
- verify(log).info("An exception has occurred in Job '{}', But failed to send alert by wechat because of: {}", "test_job", "token is invalid", cause);
+ verify(log).error("An exception has occurred in Job '{}' but failed to send wechat because of: {}", "test_job", "token is invalid", cause);
}
@Test
@@ -90,7 +90,7 @@ public final class WechatJobErrorHandlerTest {
setStaticFieldValue(actual);
Throwable cause = new RuntimeException("test");
actual.handleException("test_job", cause);
- verify(log).error("An exception has occurred in Job '{}', But failed to send alert by wechat because of", "test_job", cause);
+ verify(log).error("An exception has occurred in Job '{}' but failed to send wechat because of", "test_job", cause);
}
@Test
@@ -99,7 +99,7 @@ public final class WechatJobErrorHandlerTest {
setStaticFieldValue(actual);
Throwable cause = new RuntimeException("test");
actual.handleException("test_job", cause);
- verify(log).error("An exception has occurred in Job '{}', But failed to send alert by wechat because of: Unexpected response status: {}", "test_job", 404, cause);
+ verify(log).error("An exception has occurred in Job '{}' but failed to send wechat because of: unexpected http response status: {}", "test_job", 404, cause);
}
private WechatJobErrorHandler getWechatJobErrorHandler(final Properties props) {