Updated Branches: refs/heads/master 932c89eb8 -> c2aeea20d
fixing STRATOS-432 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/49c90173 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/49c90173 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/49c90173 Branch: refs/heads/master Commit: 49c90173f77fe8d4efdbabe35c6cb1dfe2122fec Parents: 3bea806 Author: Isuru <[email protected]> Authored: Wed Feb 12 15:46:16 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Feb 12 15:46:16 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 24 +++++++++++++++++++- .../agent/util/CartridgeAgentConstants.java | 2 ++ .../distribution/src/main/bin/stratos.sh | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/49c90173/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java index ddb5279..5ab6634 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java @@ -218,7 +218,29 @@ public class CartridgeAgent implements Runnable { } // Start the artifact update task - GitBasedArtifactRepository.getInstance().scheduleSyncTask(repoInformation, 10); + boolean artifactUpdateEnabled = Boolean.parseBoolean(System.getProperty(CartridgeAgentConstants.ENABLE_ARTIFACT_UPDATE)); + if (artifactUpdateEnabled) { + + long artifactUpdateInterval = 10; + // get update interval + String artifactUpdateIntervalStr = System.getProperty(CartridgeAgentConstants.ARTIFACT_UPDATE_INTERVAL); + + if (artifactUpdateIntervalStr != null && !artifactUpdateIntervalStr.isEmpty()) { + try { + artifactUpdateInterval = Long.parseLong(artifactUpdateIntervalStr); + + } catch (NumberFormatException e) { + log.error("Invalid artifact sync interval specified ", e); + artifactUpdateInterval = 10; + } + } + + log.info("Artifact updating task enabled, update interval: " + artifactUpdateInterval + "s"); + GitBasedArtifactRepository.getInstance().scheduleSyncTask(repoInformation, artifactUpdateInterval); + + } else { + log.info("Artifact updating task disabled"); + } } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/49c90173/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java index 0a54453..f133201 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java @@ -47,4 +47,6 @@ public class CartridgeAgentConstants implements Serializable{ public static final String LOAD_AVERAGE = "load_average"; public static final String PORTS_NOT_OPEN = "ports_not_open"; public static final String MULTITENANT = "MULTITENANT"; + public static final String ENABLE_ARTIFACT_UPDATE = "enable.artifact.update"; + public static final String ARTIFACT_UPDATE_INTERVAL = "artifact.update.interval"; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/49c90173/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh b/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh index b95301f..cab1b63 100644 --- a/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh +++ b/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh @@ -36,6 +36,8 @@ properties="-Dmb.ip=MB-IP -Dcep.stats.publisher.enabled=true -Djavax.net.ssl.trustStore=CERT-TRUSTSTORE -Djavax.net.ssl.trustStorePassword=TRUSTSTORE-PASSWORD + -Denable.artifact.update=true + -Dartifact.update.interval=10 -Denable.data.publisher=false -Dmonitoring.server.ip=MONITORING-SERVER-IP -Dmonitoring.server.port=MONITORING-SERVER-PORT
