[clusterfest commit] r235 - in trunk: conf lib src/com/flaptor/clusterfest/monitoring

[codesite...@google.com]

Author: martinmassera
Date: Mon Jul 21 12:08:40 2008
New Revision: 235

Modified:
trunk/conf/clustering.properties.defaults
trunk/lib/flaptor-util-trunk.jar
trunk/src/com/flaptor/clusterfest/monitoring/MonitorModule.java
trunk/src/com/flaptor/clusterfest/monitoring/MonitorNodeDescriptor.java

Log:
more logging

Modified: trunk/conf/clustering.properties.defaults
==============================================================================
--- trunk/conf/clustering.properties.defaults (original)
+++ trunk/conf/clustering.properties.defaults Mon Jul 21 12:08:40 2008
@@ -5,8 +5,8 @@
clustering.monitor.formatter=com.flaptor.clusterfest.monitoring.DefaultPropertyFormatter
clustering.monitor.checker=com.flaptor.clusterfest.monitoring.DefaultChecker

-clustering.monitor.enableSavedStates=true
-clustering.monitor.statesDir=states
+clustering.monitor.states.saving.enable=true
+clustering.monitor.states.saving.dir=states
clustering.monitor.logs.defaults=
clustering.monitor.logs.size=50000

Modified: trunk/lib/flaptor-util-trunk.jar
==============================================================================
Binary files. No diff available.

Modified: trunk/src/com/flaptor/clusterfest/monitoring/MonitorModule.java
==============================================================================
--- trunk/src/com/flaptor/clusterfest/monitoring/MonitorModule.java (original)
+++ trunk/src/com/flaptor/clusterfest/monitoring/MonitorModule.java Mon
Jul 21 12:08:40 2008
@@ -66,7 +66,7 @@
Config cfg = Config.getConfig("clustering.properties");
try {
statesDir = FileUtil.createOrGetDir(
- new File(cfg.getString("clustering.monitor.statesDir")).getAbsolutePath(),
+ new File(cfg.getString("clustering.monitor.states.saving.dir")).getAbsolutePath(),
true, true);
} catch (IOException e) {
throw new RuntimeException(e);

Modified: trunk/src/com/flaptor/clusterfest/monitoring/MonitorNodeDescriptor.java
==============================================================================
---
trunk/src/com/flaptor/clusterfest/monitoring/MonitorNodeDescriptor.java (original)
+++
trunk/src/com/flaptor/clusterfest/monitoring/MonitorNodeDescriptor.java
Mon Jul 21 12:08:40 2008
@@ -62,7 +62,7 @@

stateFileSerializer = new FileSerializer(new File(statesDir, node.getHost()+"."+node.getPort()+".states"));

- if
(Config.getConfig("clustering.properties").getBoolean("clustering.monitor.enableSavedStates")) {
+ if
(Config.getConfig("clustering.properties").getBoolean("clustering.monitor.states.saving.enable")) {
states = (LinkedList<NodeState>)stateFileSerializer.deserialize();
}
if (states == null) states = new LinkedList<NodeState>();
@@ -167,7 +167,7 @@

cleanupStateList();

- if
(Config.getConfig("clustering.properties").getBoolean("clustering.monitor.enableSavedStates")) {
+ if
(Config.getConfig("clustering.properties").getBoolean("clustering.monitor.states.saving.enable")) {
ClusterManager.getMultiExecutor().addExecution(
new Execution(new Callable(){
public Object call() throws Exception {