aboutsummaryrefslogtreecommitdiffstats
path: root/common/src/main/java/org
diff options
context:
space:
mode:
Diffstat (limited to 'common/src/main/java/org')
-rw-r--r--common/src/main/java/org/onap/so/logging/tasks/AuditMDCSetup.java (renamed from common/src/main/java/org/onap/so/externaltasks/logging/AuditMDCSetup.java)3
-rw-r--r--common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java7
-rw-r--r--common/src/main/java/org/onap/so/utils/ExternalTaskUtils.java6
3 files changed, 11 insertions, 5 deletions
diff --git a/common/src/main/java/org/onap/so/externaltasks/logging/AuditMDCSetup.java b/common/src/main/java/org/onap/so/logging/tasks/AuditMDCSetup.java
index 9f71e61e1f..8d98307a43 100644
--- a/common/src/main/java/org/onap/so/externaltasks/logging/AuditMDCSetup.java
+++ b/common/src/main/java/org/onap/so/logging/tasks/AuditMDCSetup.java
@@ -1,4 +1,4 @@
-package org.onap.so.externaltasks.logging;
+package org.onap.so.logging.tasks;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
@@ -53,4 +53,5 @@ public class AuditMDCSetup {
MDC.remove(ONAPLogConstants.MDCs.ELAPSED_TIME);
MDC.remove(ONAPLogConstants.MDCs.PARTNER_NAME);
}
+
}
diff --git a/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java b/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java
index 035ad1dc81..840a978a61 100644
--- a/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java
+++ b/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java
@@ -51,7 +51,12 @@ public class ExternalTaskServiceUtils {
}
public int getMaxClients() {
- return Integer.parseInt(env.getProperty("workflow.topics.maxClients", "3"));
+ return Integer.parseInt(env.getProperty("workflow.topics.maxClients", "10"));
+ }
+
+ public Long getLockDuration() {
+ Long lockDuration = Long.parseLong(env.getProperty("mso.audit.lock-time", "60000"));
+ return lockDuration;
}
@ScheduledLogging
diff --git a/common/src/main/java/org/onap/so/utils/ExternalTaskUtils.java b/common/src/main/java/org/onap/so/utils/ExternalTaskUtils.java
index 9488187003..d414135570 100644
--- a/common/src/main/java/org/onap/so/utils/ExternalTaskUtils.java
+++ b/common/src/main/java/org/onap/so/utils/ExternalTaskUtils.java
@@ -9,11 +9,11 @@ import org.springframework.stereotype.Component;
@Component
public abstract class ExternalTaskUtils {
+ private static final Logger logger = LoggerFactory.getLogger(ExternalTaskUtils.class);
+
@Autowired
Environment env;
- private static final Logger logger = LoggerFactory.getLogger(ExternalTaskUtils.class);
-
private final RetrySequenceLevel retrySequenceLevel;
public ExternalTaskUtils() {
@@ -49,7 +49,7 @@ public abstract class ExternalTaskUtils {
return seqInter;
case LONG:
String[] seqLong = {"1", "1", "2", "3", "5", "8", "13", "20"};
- if (env.getProperty("mso.workflow.topics.retrySequence") != null) {
+ if (env.getProperty("mso.workflow.topics.retrySequence.long") != null) {
seqLong = env.getProperty("mso.workflow.topics.retrySequence", String[].class);
}
return seqLong;