Merge pull request #575 from metamx/task-log-errors

Better task log errors.
This commit is contained in:
fjy 2014-06-02 14:15:45 -06:00
commit 497a5ab70c
2 changed files with 9 additions and 3 deletions

View File

@ -398,7 +398,12 @@ public class OverlordResource
if (stream.isPresent()) {
return Response.ok(stream.get().getInput()).build();
} else {
return Response.status(Response.Status.NOT_FOUND).build();
return Response.status(Response.Status.NOT_FOUND)
.entity(
"No log was found for this task. "
+ "The task may not exist, or it may not have begun running yet."
)
.build();
}
}
catch (Exception e) {

View File

@ -97,8 +97,9 @@ public class S3TaskLogs implements TaskLogs
);
}
catch (ServiceException e) {
if (e.getErrorCode() != null && (e.getErrorCode().equals("NoSuchKey") || e.getErrorCode()
.equals("NoSuchBucket"))) {
if (404 == e.getResponseCode()
|| "NoSuchKey".equals(e.getErrorCode())
|| "NoSuchBucket".equals(e.getErrorCode())) {
return Optional.absent();
} else {
throw new IOException(String.format("Failed to stream logs from: %s", taskKey), e);