[clusterfest commit] r222 - in trunk: src/com/flaptor/clusterfest/monitoring websrc/web-clusterfest

[codesite...@google.com]

Author: martinmassera
Date: Thu Jul 10 11:48:53 2008
New Revision: 222

Modified:
trunk/src/com/flaptor/clusterfest/monitoring/MonitorModule.java
trunk/websrc/web-clusterfest/monitorLog.vm
trunk/websrc/web-clusterfest/monitorNode.vm

Log:
fixed bug when adding a log to monitor

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 Thu
Jul 10 11:48:53 2008
@@ -113,15 +113,15 @@
* @return a pair (log, timestamp)
*/
public Pair<String, Long> retrieveLog(NodeDescriptor node, String
logName) {
- MonitorNodeDescriptor moduleNode = getModuleNode(node);
- if (!moduleNode.getLogs().containsKey(logName)) {
+ MonitorNodeDescriptor monitorNode = getModuleNode(node);
+ if (!monitorNode.getLogs().containsKey(logName)) {
try {
- moduleNode.updateLog(logName);
+ monitorNode.updateLog(logName);
} catch (NodeException e) {
logger.warn(e);
}
}
- return moduleNode.retrieveLog(logName);
+ return monitorNode.retrieveLog(logName);
}

public void updateLogs(NodeDescriptor node) {
@@ -270,7 +270,7 @@
String action = request.getParameter("action");
if ("update".equals(action)) {
updateLogs(node);
- }
+ }
String logName = request.getParameter("log");
request.setAttribute("logName", logName);
request.setAttribute("log", retrieveLog(node, logName));

Modified: trunk/websrc/web-clusterfest/monitorLog.vm
==============================================================================
--- trunk/websrc/web-clusterfest/monitorLog.vm (original)
+++ trunk/websrc/web-clusterfest/monitorLog.vm Thu Jul 10 11:48:53 2008
@@ -32,10 +32,10 @@
<span class="fuzzy">at $dateUtil.toDate($e.getValue().last())</span></td></tr>
#end
<tr><td>
- <form action="monitorLog.jsp">
- <input type="hidden" name="node" value="$idx"/>
+ <form action="monitorLog.do">
+ <input type="hidden" name="idx" value="$idx"/>
<input type="text" name="log" value=""/>
- <input type="submit" value="log file"/>
+ <input type="submit" value="add log file"/>
</form>
</td></tr>
</table>

Modified: trunk/websrc/web-clusterfest/monitorNode.vm
==============================================================================
--- trunk/websrc/web-clusterfest/monitorNode.vm (original)
+++ trunk/websrc/web-clusterfest/monitorNode.vm Thu Jul 10 11:48:53 2008
@@ -43,10 +43,10 @@
<span class="fuzzy">at $dateUtil.toDate($nodeState.getTimestamp())</span></td></tr>
#end
<tr><td>
- <form action="monitorLog.jsp">
- <input type="hidden" name="node" value="$idx"/>
+ <form action="monitorLog.do">
+ <input type="hidden" name="idx" value="$idx"/>
<input type="text" name="log" value=""/>
- <input type="submit" value="log file"/>
+ <input type="submit" value="add log file"/>
</form>
</td></tr>
</table>