Author: hiranya
Date: Tue Feb 8 06:08:22 2011
New Revision: 1068272
URL: http://svn.apache.org/viewvc?rev=1068272&view=rev
Log:
Making the hot update timeout configrable
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/PriorityExecutorDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java?rev=1068272&r1=1068271&r2=1068272&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
Tue Feb 8 06:08:22 2011
@@ -369,9 +369,15 @@ public abstract class AbstractSynapseArt
out.close();
}
- protected void sleep(long millis) {
+ protected void waitForCompletion() {
+ long timeout = 2000L;
+ Parameter param =
cfgCtx.getAxisConfiguration().getParameter("hotupdate.timeout");
+ if (param != null && param.getValue() != null) {
+ timeout = Long.parseLong(param.getValue().toString());
+ }
+
try {
- Thread.sleep(millis);
+ Thread.sleep(timeout);
} catch (InterruptedException ignored) {
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java?rev=1068272&r1=1068271&r2=1068272&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java
Tue Feb 8 06:08:22 2011
@@ -115,7 +115,7 @@ public class EndpointDeployer extends Ab
log.info("Endpoint: " + ep.getName() + " has been updated from the
file: " + fileName);
- sleep(2000);
+ waitForCompletion();
existingEp.destroy();
if (existingArtifactName.equals(ep.getName())) {
// If the endpoint name was same as the old one, above method
call (destroy)
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/PriorityExecutorDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/PriorityExecutorDeployer.java?rev=1068272&r1=1068271&r2=1068272&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/PriorityExecutorDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/PriorityExecutorDeployer.java
Tue Feb 8 06:08:22 2011
@@ -110,7 +110,7 @@ public class PriorityExecutorDeployer ex
log.info("Executor: " + existingArtifactName + " has been
undeployed");
}
- sleep(2000);
+ waitForCompletion();
existingExecutor.destroy();
log.info("PriorityExecutor: " + e.getName() + " has been updated
from the file: " + fileName);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java?rev=1068272&r1=1068271&r2=1068272&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java
Tue Feb 8 06:08:22 2011
@@ -125,7 +125,7 @@ public class SequenceDeployer extends Ab
log.info("Sequence: " + seq.getName() + " has been updated from
the file: " + fileName);
- sleep(2000); // Give some time for worker threads to release the
old sequence
+ waitForCompletion(); // Give some time for worker threads to
release the old sequence
existingSeq.destroy();
return seq.getName();
