Repository: incubator-unomi Updated Branches: refs/heads/master 1e60e8de8 -> 3f3b20aaf
UNOMI-102 : Limit number of error in the execution report Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/3f3b20aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/3f3b20aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/3f3b20aa Branch: refs/heads/master Commit: 3f3b20aaf3c5dd04abd47c25c849ecccfc372c61 Parents: 1e60e8d Author: Abdelkader Midani <amid...@apache.org> Authored: Wed Jul 12 16:31:22 2017 +0200 Committer: Abdelkader Midani <amid...@apache.org> Committed: Wed Jul 12 16:31:22 2017 +0200 ---------------------------------------------------------------------- .../unomi/router/core/context/RouterCamelContext.java | 5 +++++ .../core/processor/ImportRouteCompletionProcessor.java | 9 ++++++++- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 3 +++ .../src/main/resources/org.apache.unomi.router.cfg | 3 +++ 4 files changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3f3b20aa/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java index 1d66cf7..4596af7 100644 --- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java +++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java @@ -64,6 +64,7 @@ public class RouterCamelContext implements SynchronousBundleListener { private JacksonDataFormat jacksonDataFormat; private String uploadDir; private String execHistorySize; + private String execErrReportSize; private Map<String, String> kafkaProps; private String configType; private String allowedEndpoints; @@ -74,6 +75,10 @@ public class RouterCamelContext implements SynchronousBundleListener { this.execHistorySize = execHistorySize; } + public void setExecErrReportSize(String execErrReportSize) { + this.execErrReportSize = execErrReportSize; + } + public void setBundleContext(BundleContext bundleContext) { this.bundleContext = bundleContext; } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3f3b20aa/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java index ac39312..325aec4 100644 --- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java +++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java @@ -33,6 +33,7 @@ public class ImportRouteCompletionProcessor implements Processor { private static final Logger logger = LoggerFactory.getLogger(ImportRouteCompletionProcessor.class.getName()); private ImportExportConfigurationService<ImportConfiguration> importConfigurationService; private int executionsHistorySize; + private int execErrReportSize; @Override public void process(Exchange exchange) throws Exception { @@ -54,7 +55,9 @@ public class ImportRouteCompletionProcessor implements Processor { successCount++; } else if (line instanceof ImportLineError) { failureCount++; - errors.add(((ImportLineError) line)); + if(errors.size() < execErrReportSize) { + errors.add(((ImportLineError) line)); + } } else { ignoreCount++; } @@ -93,4 +96,8 @@ public class ImportRouteCompletionProcessor implements Processor { public void setExecutionsHistorySize(int executionsHistorySize) { this.executionsHistorySize = executionsHistorySize; } + + public void setExecErrReportSize(int execErrReportSize) { + this.execErrReportSize = execErrReportSize; + } } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3f3b20aa/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---------------------------------------------------------------------- diff --git a/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 6b19197..ea6ba3c 100644 --- a/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -37,6 +37,7 @@ <cm:property name="kafka.autoCommit" value="true"/> <cm:property name="import.oneshot.uploadDir" value="/tmp/oneshot_import_configs/"/> <cm:property name="executionsHistory.size" value="5"/> + <cm:property name="executions.error.report.size" value="200"/> </cm:default-properties> </cm:property-placeholder> @@ -47,6 +48,7 @@ <bean id="importRouteCompletionProcessor" class="org.apache.unomi.router.core.processor.ImportRouteCompletionProcessor"> <property name="importConfigurationService" ref="importConfigurationService"/> <property name="executionsHistorySize" value="${executionsHistory.size}"/> + <property name="execErrReportSize" value="${executions.error.report.size}"/> </bean> <bean id="exportRouteCompletionProcessor" class="org.apache.unomi.router.core.processor.ExportRouteCompletionProcessor"> @@ -94,6 +96,7 @@ <property name="allowedEndpoints" value="${config.allowedEndpoints}"/> <property name="uploadDir" value="${import.oneshot.uploadDir}"/> <property name="execHistorySize" value="${executionsHistory.size}"/> + <property name="execErrReportSize" value="${executions.error.report.size}"/> <property name="bundleContext" ref="blueprintBundleContext"/> <property name="jacksonDataFormat" ref="jacksonDataFormat"/> <property name="kafkaProps"> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3f3b20aa/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg ---------------------------------------------------------------------- diff --git a/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg b/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg index 34c80ad..6d5f985 100644 --- a/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg +++ b/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg @@ -36,5 +36,8 @@ import.oneshot.uploadDir=${karaf.data}/tmp/unomi_oneshot_import_configs/ #Import/Export executions history size executionsHistory.size=5 +#errors report size +executions.error.report.size=200 + #Allowed source endpoints config.allowedEndpoints=file,ftp,sftp,ftps \ No newline at end of file
