import jalview.ws.params.WsParamSetI;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOError;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.EnumMap;
import java.util.HashSet;
stateMap.put(JobState.QUEUED, WsJob.JobState.QUEUED);
stateMap.put(JobState.RUNNING, WsJob.JobState.RUNNING);
stateMap.put(JobState.COMPLETED, WsJob.JobState.FINISHED);
- stateMap.put(JobState.INTERRUPED, WsJob.JobState.CANCELLED);
+ stateMap.put(JobState.INTERRUPTED, WsJob.JobState.CANCELLED);
stateMap.put(JobState.DELETED, WsJob.JobState.CANCELLED);
stateMap.put(JobState.FAILED, WsJob.JobState.FAILED);
stateMap.put(JobState.ERROR, WsJob.JobState.SERVERERROR);
public SlivkaWSInstance(SlivkaClient client, SlivkaService service, String action)
{
- super(service.getName(), action, service.getLabel(), "Slivka", client.getUrl().toString());
+ super(action, action, service.getLabel(), "Slivka", client.getUrl().toString());
this.client = client;
this.service = service;
}
}
else
{
- form.insert(fieldName, field.valueOf(arg.getValue()));
+ form.insert(fieldName, arg.getValue());
}
}
}
public final boolean updateJobProgress(WsJob job) throws IOException
{
List<RemoteFile> files = client.getJobResults(job.getJobId());
- Optional<RemoteFile> logFile = files.stream()
- .filter(f -> f.getLabel().equals("log")).findFirst();
+ RemoteFile logFile=null;
+ for (RemoteFile f : files)
+ {
+ if (f.getLabel().equals("log"))
+ {
+ logFile = f; break;
+ }
+ }
+
boolean newContent = false;
- if (logFile.isPresent())
+ if (logFile!=null)
{
- InputStream stream = logFile.get().getContent();
- long nextChunk = stream.skip(job.getNextChunk());
- int len = appendJobStatus(job, stream);
- job.setnextChunk(nextChunk + len);
- newContent |= len > 0;
+ ByteArrayOutputStream output = new ByteArrayOutputStream();
+ logFile.writeTo(output);
+ if (output.size() > job.getNextChunk())
+ {
+ newContent = true;
+ job.setStatus(output.toString("UTF-8"));
+ job.setnextChunk(output.size());
+ }
}
if (failedStates.contains(job.getJobState()))
{
- Optional<RemoteFile> errLogFile = files.stream()
- .filter(f -> f.getLabel().equals("error-log")).findFirst();
- if (errLogFile.isPresent())
+
+ RemoteFile errLogFile = null;
+ for (RemoteFile f : files)
{
- newContent |= appendJobStatus(job, errLogFile.get().getContent()) > 0;
+ if (f.getLabel().equals("error-log"))
+ {
+ errLogFile = f;
+ break;
+ }
}
- }
- return newContent;
- }
- private int appendJobStatus(WsJob job, InputStream stream) throws IOException
- {
- StringBuilder builder = new StringBuilder(job.getStatus());
- InputStreamReader reader = new InputStreamReader(stream);
- char[] buffer = new char[4096];
- int chunkLen = 0;
- int len = 0;
- while ((len = reader.read(buffer)) != -1)
- {
- chunkLen += len;
- builder.append(buffer, 0, len);
+ if (errLogFile!=null)
+ {
+ ByteArrayOutputStream output = new ByteArrayOutputStream();
+ errLogFile.writeTo(output);
+ if (output.size() > 0)
+ {
+ newContent = true;
+ job.setStatus(job.getStatus() + "\n" + output.toString("UTF-8"));
+ }
+ }
}
- job.setStatus(builder.toString());
- return chunkLen;
+ return newContent;
}
@Override