hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 18:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-3651 configurable buffer

Browse Source
This commit is contained in:
frederic
2017-11-06 15:31:46 +01:00
committed by Tom Desair
parent db54bc12f2
commit 34e6676129
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
dspace-spring-rest/src/main/java/org/dspace/app/rest/utils/MultipartFileSender.java
View File

@@ -56,8 +56,8 @@ public class MultipartFileSender {
private static final String CONTENT_DISPOSITION_FORMAT = "%s;filename=\"%s\""; private static final String CONTENT_DISPOSITION_FORMAT = "%s;filename=\"%s\"";
private static final String BYTES_DINVALID_BYTE_RANGE_FORMAT = "bytes */%d"; private static final String BYTES_DINVALID_BYTE_RANGE_FORMAT = "bytes */%d";
private static final String CACHE_CONTROL = "Cache-Control"; private static final String CACHE_CONTROL = "Cache-Control";
private static int DEFAULT_BUFFER_SIZE = 1000000; // ..bytes = 20KB. private static int DEFAULT_BUFFER_SIZE = 1000000;
private static final long DEFAULT_EXPIRE_TIME = 60L * 60L * 1000L; // ..ms = 1 week. private static final long DEFAULT_EXPIRE_TIME = 60L * 60L * 1000L;
//no-cache so request is always performed for logging //no-cache so request is always performed for logging
private static final String CACHE_CONTROL_SETTING = "private, no-cache"; private static final String CACHE_CONTROL_SETTING = "private, no-cache";
@@ -74,7 +74,16 @@ public class MultipartFileSender {
ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService(); ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
String bufferSize = configurationService.getProperty("bitstream-download.buffer.size"); String bufferSize = configurationService.getProperty("bitstream-download.buffer.size");
if (StringUtils.isNotEmpty(bufferSize)) { if (StringUtils.isNotEmpty(bufferSize)) {
DEFAULT_BUFFER_SIZE = Integer.parseInt(bufferSize); try {
int configuredBufferSize = Integer.parseInt(bufferSize);
if (configuredBufferSize > 0) {
DEFAULT_BUFFER_SIZE = configuredBufferSize;
} else {
log.debug("bitstream buffer size configured as < 0, using default");
}
} catch (NumberFormatException e) {
log.error("bitstream-download.buffer.size property wrongly configured, this should be a positive integer");
}
} }
} }
@@ -119,11 +128,11 @@ public class MultipartFileSender {
return; return;
} }
// if (!Files.exists(filepath)) { if (inputStream == null) {
// logger.error("File doesn't exist at URI : {}", filepath.toAbsolutePath().toString()); log.error("Bitstream has no content");
// response.sendError(HttpServletResponse.SC_NOT_FOUND); response.sendError(HttpServletResponse.SC_NOT_FOUND);
// return; return;
// } }
Long length = bitstream.getSizeBytes(); Long length = bitstream.getSizeBytes();
String fileName = bitstream.getName(); String fileName = bitstream.getName();
@@ -136,12 +145,12 @@ public class MultipartFileSender {
// Validate request headers for caching --------------------------------------------------- // Validate request headers for caching ---------------------------------------------------
// If-None-Match header should contain "*" or ETag. If so, then return 304. // If-None-Match header should contain "*" or ETag. If so, then return 304.
String ifNoneMatch = request.getHeader(IF_NONE_MATCH); String ifNoneMatch = request.getHeader(IF_NONE_MATCH);
// if (nonNull(ifNoneMatch) && matches(ifNoneMatch, bitstream.getCheckSum().getValue())) { if (nonNull(ifNoneMatch) && matches(ifNoneMatch, bitstream.getCheckSum().getValue())) {
// log.error("If-None-Match header should contain \"*\" or ETag. If so, then return 304."); log.error("If-None-Match header should contain \"*\" or ETag. If so, then return 304.");
// response.setHeader(ETAG, bitstream.getCheckSum().getValue()); // Required in 304. response.setHeader(ETAG, bitstream.getCheckSum().getValue()); // Required in 304.
// response.sendError(HttpServletResponse.SC_NOT_MODIFIED); response.sendError(HttpServletResponse.SC_NOT_MODIFIED);
// return; return;
// } }
// If-Modified-Since header should be greater than LastModified. If so, then return 304. // If-Modified-Since header should be greater than LastModified. If so, then return 304.
// This header is ignored if any If-None-Match header is specified. // This header is ignored if any If-None-Match header is specified.
@@ -241,8 +250,8 @@ public class MultipartFileSender {
response.setDateHeader(LAST_MODIFIED, lastModified); response.setDateHeader(LAST_MODIFIED, lastModified);
response.setDateHeader(EXPIRES, System.currentTimeMillis() + DEFAULT_EXPIRE_TIME); response.setDateHeader(EXPIRES, System.currentTimeMillis() + DEFAULT_EXPIRE_TIME);
//TODO what does this mean //No-cache so that we can log every download
response.setHeader(CACHE_CONTROL, "private, no-cache"); response.setHeader(CACHE_CONTROL, CACHE_CONTROL_SETTING);
if (isNullOrEmpty(disposition)) { if (isNullOrEmpty(disposition)) {

2
dspace/config/dspace.cfg
View File

@@ -1962,7 +1962,7 @@ mail.helpdesk = ${mail.admin}
# Should all Request Copy emails go to the helpdesk instead of the item submitter? # Should all Request Copy emails go to the helpdesk instead of the item submitter?
request.item.helpdesk.override = false request.item.helpdesk.override = false
#bitstream-download.buffer.size = 1000000 bitstream-download.buffer.size = 1000