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

Removed deprecated search.dir-property; added null check for directory properties

Browse Source
This commit is contained in:
Ilja Sidoroff
2016-09-13 12:56:40 +00:00
parent 92b58c62c8
commit 5061c0bb49
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dspace-api/src/main/java/org/dspace/health/InfoCheck.java
View File

@@ -43,34 +43,35 @@ public class InfoCheck extends Check {
sb.append("\n");
DSBitStoreService localStore = new DSpace().getServiceManager().getServicesByType(DSBitStoreService.class).get(0);
for (String[] ss : new String[][] {
new String[] {
localStore.getBaseDir().toString(),
"Assetstore size", },
new String[] {
configurationService.getProperty("search.dir"),
"Search dir size", },
new String[] {
configurationService.getProperty("log.report.dir"),
"Log dir size", }, })
{
try {
File dir = new File(ss[0]);
if (dir.exists()) {
long dir_size = FileUtils.sizeOfDirectory(dir);
sb.append(String.format("%-20s: %s\n", ss[1],
FileUtils.byteCountToDisplaySize(dir_size))
);
} else {
sb.append(String.format("Directory [%s] does not exist!\n", ss[0]));
if (ss[0] != null) {
try {
File dir = new File(ss[0]);
if (dir.exists()) {
long dir_size = FileUtils.sizeOfDirectory(dir);
sb.append(String.format("%-20s: %s\n", ss[1],
FileUtils.byteCountToDisplaySize(dir_size))
);
} else {
sb.append(String.format("Directory [%s] does not exist!\n", ss[0]));
}
} catch(Exception e) {
error(e, "directory - " + ss[0]);
}
}catch(Exception e) {
error(e, "directory - " + ss[0]);
}
else { // cannot read property for some reason
sb.append(String.format("Could not get information for %s!\n", ss[1]));
}
}
return sb.toString();
}
}
}