Revision: 15704
Author: vladimir.ralev
Date: Fri Dec 10 07:20:18 2010
Log: Update Issue 1871
Auto-reload changes
http://code.google.com/p/mobicents/source/detail?r=15704
Modified:
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/BalancerAlgorithm.java
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/BalancerRunner.java
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/ClusterSubdomainAffinityAlgorithm.java
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/DefaultBalancerAlgorithm.java
=======================================
---
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/BalancerAlgorithm.java
Mon Nov 9 16:48:27 2009
+++
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/BalancerAlgorithm.java
Fri Dec 10 07:20:18 2010
@@ -100,4 +100,6 @@
* Assign callid to node
*/
void assignToNode(String id, SIPNode node);
-}
+
+ void configurationChanged();
+}
=======================================
---
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/BalancerRunner.java
Mon Nov 15 14:36:51 2010
+++
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/BalancerRunner.java
Fri Dec 10 07:20:18 2010
@@ -10,6 +10,8 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Timer;
+import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicLong;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -168,12 +170,15 @@
return;
}
}
+ Timer timer;
+ long lastupdate = 0;
/**
* @param configurationFileLocation
*/
- public void start(String configurationFileLocation) {
+ public void start(final String configurationFileLocation) {
File file = new File(configurationFileLocation);
+ lastupdate = file.lastModified();
FileInputStream fileInputStream = null;
try {
fileInputStream = new FileInputStream(file);
@@ -186,12 +191,47 @@
properties.load(fileInputStream);
} catch (IOException e) {
throw new IllegalArgumentException("Unable to load the properties
configuration file located at " + configurationFileLocation);
- }
+ } finally {
+ try {
+ fileInputStream.close();
+ } catch (IOException e) {
+ logger.warning("Problem closing file " + e);
+ }
+ }
+ timer = new Timer();
+ timer.scheduleAtFixedRate(new TimerTask() {
+ public void run() {
+ File conf = new File(configurationFileLocation);
+ if(lastupdate < conf.lastModified()) {
+ lastupdate = conf.lastModified();
+ logger.info("Configuration file changed,
applying changes.");
+ FileInputStream fileInputStream = null;
+ try {
+ fileInputStream = new
FileInputStream(conf);
+
BalancerContext.balancerContext.properties.load(fileInputStream);
+
BalancerContext.balancerContext.balancerAlgorithm.configurationChanged();
+ } catch (Exception e) {
+ logger.warning("Problem reloading
configuration " + e);
+ } finally {
+ if(fileInputStream != null) {
+ try {
+
fileInputStream.close();
+ } catch (Exception e) {
+
logger.severe("Problem closing stream " + e);
+ }
+ }
+ }
+ }
+ }
+ }, 3000, 2000);
+
start(properties);
}
public void stop() {
+ timer.cancel();
+ timer = null;
logger.info("Stopping the sip forwarder");
fwd.stop();
logger.info("Stopping the http forwarder");
=======================================
---
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/ClusterSubdomainAffinityAlgorithm.java
Thu Dec 9 18:04:20 2010
+++
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/ClusterSubdomainAffinityAlgorithm.java
Fri Dec 10 07:20:18 2010
@@ -261,6 +261,7 @@
}
public void loadSubclusters(String subclustersString) {
+ ConcurrentHashMap<String, List<String>> map = new
ConcurrentHashMap<String, List<String>>();
if(subclustersString != null) {
subclustersString = subclustersString.replaceAll(" ",
"");
String[] groups = subclustersString.split("\\)\\(");
@@ -280,10 +281,11 @@
for(String host:hosts) {
List<String> tmp = new
LinkedList<String>(hostGroupList);
tmp.remove(host);
- nodeToNodeGroup.put(host, tmp);
+ map.put(host, tmp);
}
}
}
+ nodeToNodeGroup = map;
}
public String dumpSubcluster() {
@@ -359,4 +361,13 @@
}
}
-}
+ public void configurationChanged() {
+ try {
+
loadSubclusters(getProperties().getProperty("subclusterMap"));
+ logger.info("Subclusters reloaded. The groups are as follows:" +
dumpSubcluster());
+ } catch (Exception e) {
+ logger.log(Level.SEVERE, "Subcluster changes were
unsuccesful", e);
+ }
+ }
+
+}
=======================================
---
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/DefaultBalancerAlgorithm.java
Thu Aug 5 07:10:40 2010
+++
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/DefaultBalancerAlgorithm.java
Fri Dec 10 07:20:18 2010
@@ -30,6 +30,9 @@
public void processInternalRequest(Request request) {
}
+ public void configurationChanged() {
+
+ }
public SIPNode processHttpRequest(HttpRequest request) {
if(BalancerContext.balancerContext.nodes.size()>0) {