You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2013/12/13 22:47:51 UTC
svn commit: r1550839 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Author: degenaro
Date: Fri Dec 13 21:47:51 2013
New Revision: 1550839
URL: http://svn.apache.org/r1550839
Log:
UIMA-2959 DUCC webserver (WS) jd.err.log not listed properly in Job Processes tab...jd.out.log is listed twice!
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1550839&r1=1550838&r2=1550839&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Fri Dec 13 21:47:51 2013
@@ -392,6 +392,10 @@ public class DuccHandler extends DuccAbs
private void buildJobProcessListEntry(StringBuffer pb, DuccWorkJob job, IDuccProcess process, DetailsType dType, ShareType sType, int counter) {
String location = "buildJobProcessListEntry";
+ String pid = process.getPID();
+ if(pid == null) {
+ return;
+ }
StringBuffer rb = new StringBuffer();
int COLS = 26;
StringBuffer[] cbList = new StringBuffer[COLS];
@@ -404,10 +408,6 @@ public class DuccHandler extends DuccAbs
String href = "<a href=\""+duccLogData+"?"+"fname="+logsjobdir+logfile+"\" onclick=\"var newWin = window.open(this.href,'child','height=800,width=1200,scrollbars'); newWin.focus(); return false;\">"+logfile+"</a>";
String tr = trGet(counter);
rb.append(tr);
- String pid = process.getPID();
- if(pid == null) {
- return;
- }
int index = -1;
// Id
index++; // jp.00
@@ -911,41 +911,37 @@ public class DuccHandler extends DuccAbs
// jd.err.log
switch(sType) {
case JD:
- StringBuffer sb;
- rb = new StringBuffer();
- rb.append("<tr>");
if(fileExists(logsjobdir+errfile)) {
- String href2 = "<a href=\""+duccLogData+"?"+"fname="+logsjobdir+errfile+"\" onclick=\"var newWin = window.open(this.href,'child','height=800,width=1200,scrollbars'); newWin.focus(); return false;\">"+errfile+"</a>";
+ rb = new StringBuffer();
+ cbList = new StringBuffer[COLS];
for(int i=0; i < COLS; i++) {
cbList[i] = new StringBuffer();
cbList[i].append("<td>");
cbList[i].append("</td>");
}
- index = -1;
// Id
- index++; // jp.00
- // Err Log
- index++; // jp.01
- sb = new StringBuffer();
- sb.append("<td>");
- sb.append(href2);
- sb.append("</td>");
- cbList[index] = sb;
- // Err Log Size (in MB)
- index++; // jp.02
- sb = new StringBuffer();
- sb.append("<td align=\"right\">");
- sb.append(getFileSize(logsjobdir+errfile));
- sb.append("</td>");
- cbList[index] = sb;
- }
- for(int i=0; i < COLS; i++) {
- rb.append(cbList[i]);
+ index = 0;
+ // Log
+ index = 1;
+ String href2 = "<a href=\""+duccLogData+"?"+"fname="+logsjobdir+errfile+"\" onclick=\"var newWin = window.open(this.href,'child','height=800,width=1200,scrollbars'); newWin.focus(); return false;\">"+errfile+"</a>";
+ cbList[index] = new StringBuffer();
+ cbList[index].append("<td>");
+ cbList[index].append(href2);
+ cbList[index].append("</td>");
+ // Size
+ index = 2;
+ cbList[index] = new StringBuffer();
+ cbList[index].append("<td align=\"right\">");
+ cbList[index].append(getFileSize(logsjobdir+errfile));
+ cbList[index].append("</td>");
+ // row
+ rb.append(tr);
+ for(int i=0; i < COLS; i++) {
+ rb.append(cbList[i]);
+ }
+ rb.append("</tr>");
+ pb.append(rb.toString());
}
- rb.append("</tr>");
- pb.append(rb.toString());
- break;
- default:
break;
}
}
@@ -1103,17 +1099,27 @@ public class DuccHandler extends DuccAbs
if(job != null) {
Iterator<DuccId> iterator = null;
iterator = job.getDriver().getProcessMap().keySet().iterator();
- int counter = 0;
+ int counter = 1;
while(iterator.hasNext()) {
DuccId processId = iterator.next();
IDuccProcess process = job.getDriver().getProcessMap().get(processId);
- buildJobProcessListEntry(sb, job, process, DetailsType.Job, ShareType.JD, ++counter);
+ StringBuffer bb = new StringBuffer();
+ buildJobProcessListEntry(bb, job, process, DetailsType.Job, ShareType.JD, counter);
+ if(bb.length() > 0) {
+ sb.append(bb.toString());
+ counter++;
+ }
}
iterator = job.getProcessMap().keySet().iterator();
while(iterator.hasNext()) {
DuccId processId = iterator.next();
IDuccProcess process = job.getProcessMap().get(processId);
- buildJobProcessListEntry(sb, job, process, DetailsType.Job, ShareType.UIMA, ++counter);
+ StringBuffer bb = new StringBuffer();
+ buildJobProcessListEntry(bb, job, process, DetailsType.Job, ShareType.UIMA, counter);
+ if(bb.length() > 0) {
+ sb.append(bb.toString());
+ counter++;
+ }
}
}
if(sb.length() == 0) {