You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2018/11/15 13:13:36 UTC
[ignite-teamcity-bot] 01/02: IGNITE-10275 Jira spam fast fix -
Fixes #72.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit 3302a0ea031d28a8c2ab539a8298cf8934cc32e7
Author: ololo3000 <pm...@gmail.com>
AuthorDate: Thu Nov 15 16:12:51 2018 +0300
IGNITE-10275 Jira spam fast fix - Fixes #72.
Signed-off-by: Dmitriy Pavlov <dp...@apache.org>
---
.../apache/ignite/ci/observer/ObserverTask.java | 45 +++++++++++-----------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java
index 5ad1350..8676868 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java
@@ -141,7 +141,7 @@ public class ObserverTask extends TimerTask {
if (info.isFinishedWithFailures(teamcity)) {
boolean rmv = compactInfos().remove(compactInfo);
-
+
Preconditions.checkState(rmv, "Key not found: " + compactInfo);
logger.error("JIRA will not be commented." +
@@ -157,34 +157,35 @@ public class ObserverTask extends TimerTask {
continue;
}
- ICredentialsProv creds = tcHelper.getServerAuthorizerCreds();
+ try {
+ rmvdVisas.add(objMapper.writeValueAsString(compactInfo));
+ }
+ catch (Exception e) {
+ logger.error("JSON string parse failed: " + e.getMessage(), e);
- Visa visa = jiraIntegration.notifyJira(info.srvId, creds, info.buildTypeId,
- info.branchForTc, info.ticket);
+ return "Exception while JSON parsing: " + e.getClass().getSimpleName() + ": " + e.getMessage();
+ }
- visasHistoryStorage.updateVisaRequestRes(info.getContributionKey(), info.date, visa);
+ try {
+ boolean rmv = compactInfos().remove(compactInfo);
- if (visa.isSuccess()) {
- ticketsNotified.add(info.ticket);
+ if (!rmv)
+ continue;
+ }
+ catch (Exception e) {
+ logger.error("cache remove: " + e.getMessage(), e);
+
+ return X.getFullStackTrace(e);
+ }
- try {
- rmvdVisas.add(objMapper.writeValueAsString(compactInfo));
- }
- catch (Exception e) {
- logger.error("JSON string parse failed: " + e.getMessage(), e);
+ ICredentialsProv creds = tcHelper.getServerAuthorizerCreds();
- return "Exception while JSON parsing: " + e.getClass().getSimpleName() + ": " + e.getMessage();
- }
+ Visa visa = jiraIntegration.notifyJira(info.srvId, creds, info.buildTypeId,
+ info.branchForTc, info.ticket);
- try {
- compactInfos().remove(compactInfo);
- }
- catch (Exception e) {
- logger.error("cache remove: " + e.getMessage(), e);
+ visasHistoryStorage.updateVisaRequestRes(info.getContributionKey(), info.date, visa);
- return X.getFullStackTrace(e);
- }
- }
+ ticketsNotified.add(info.ticket);
}
return "Checked " + checkedBuilds + " not finished " + notFinishedBuilds + " notified: " + ticketsNotified +