From 725abd0fef6ef01423da0b513c5239e6e02da04f Mon Sep 17 00:00:00 2001
From: Tim Olsen <tim@deck5consulting.com>
Date: Wed, 10 Aug 2016 16:40:37 -0500
Subject: [PATCH] XNAT-4458: Modified SystemPathVerification to only email when
resources are present, catch all Throwable errors, and cleaned up display
names.
---
.gitignore | 1 +
.../xnat/initialization/tasks/SystemPathVerification.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6e5956be..44ff23c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ gradle.properties
InstanceSettings.xml
src/main/resources/META-INF/xnat/auth
MANIFEST.MF
+/ide-bin/
diff --git a/src/main/java/org/nrg/xnat/initialization/tasks/SystemPathVerification.java b/src/main/java/org/nrg/xnat/initialization/tasks/SystemPathVerification.java
index 16f480df..a8feecce 100644
--- a/src/main/java/org/nrg/xnat/initialization/tasks/SystemPathVerification.java
+++ b/src/main/java/org/nrg/xnat/initialization/tasks/SystemPathVerification.java
@@ -51,13 +51,14 @@ public class SystemPathVerification extends AbstractInitializingTask {
public void run() {
if (_appInfo.isInitialized()) {
try {
- validatePath(_config.getArchivePath(), "Archive", true);
+ final Integer resourceCount = _template.queryForObject("SELECT COUNT(xnat_abstractresource_id) AS COUNT FROM xnat_abstractresource", Integer.class);
+
+ validatePath(_config.getArchivePath(), "Archive", (resourceCount>0));
validatePath(_config.getCachePath(), "Cache", false);
validatePath(_config.getPipelinePath(), "Pipeline", false);
validatePath(_config.getBuildPath(), "Build", false);
validatePath(_config.getPrearchivePath(), "Prearchive", false);
- final Integer resourceCount = _template.queryForObject("SELECT COUNT(xnat_abstractresource_id) AS COUNT FROM xnat_abstractresource", Integer.class);
if (pathErrors.size() > 0) {
// Send warning email to admin and issue browser notification
notifyOfPathErrors(resourceCount);
--
GitLab