From f19c49b05fd21b72ae956535b81be38ee60f3f68 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Thu, 22 Dec 2016 10:09:32 +0000 Subject: [PATCH] MNT-17045: CONTENT INTEGRITY ERROR too generic. we would need to ouput the path of the missing file we check git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133998 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/system-messages.properties | 2 +- .../org/alfresco/repo/admin/ConfigurationChecker.java | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/config/alfresco/messages/system-messages.properties b/config/alfresco/messages/system-messages.properties index 0d41f7871b..2bdac7217d 100644 --- a/config/alfresco/messages/system-messages.properties +++ b/config/alfresco/messages/system-messages.properties @@ -13,7 +13,7 @@ system.config_check.warn.dir_root=The ''dir.root'' property is set to a relative system.config_check.msg.dir_root=The root data directory (''dir.root'') is: {0} system.config_check.err.indexes.duplicate_root_node=The store ''{0}'' has a duplicate root node entry. system.config_check.err.missing_index=CONTENT INTEGRITY ERROR: Indexes not found for {0} stores. -system.config_check.err.missing_content=CONTENT INTEGRITY ERROR: System content not found in content store. +system.config_check.err.missing_content=CONTENT INTEGRITY ERROR: System content not found in content store: ''{0}'' system.config_check.err.fix_dir_root=Ensure that the ''dir.root'' property ''{0}'' is pointing to the correct data location. system.config_check.msg.howto_index_recover=You may set 'index.recovery.mode=FULL' if you need to rebuild the indexes. system.config_check.warn.starting_with_errors=Alfresco Content Services is starting with errors. diff --git a/source/java/org/alfresco/repo/admin/ConfigurationChecker.java b/source/java/org/alfresco/repo/admin/ConfigurationChecker.java index 41ed9eb90a..a752cd02a4 100644 --- a/source/java/org/alfresco/repo/admin/ConfigurationChecker.java +++ b/source/java/org/alfresco/repo/admin/ConfigurationChecker.java @@ -227,6 +227,8 @@ public class ConfigurationChecker extends AbstractLifecycleBean { // the property is there, but the content is not versionPropertiesContentAvailable = false; + String msg = I18NUtil.getMessage(ERR_MISSING_CONTENT, reader.getContentUrl()); + logger.error(msg); } } @@ -245,12 +247,6 @@ public class ConfigurationChecker extends AbstractLifecycleBean String msgRecover = I18NUtil.getMessage(MSG_HOWTO_INDEX_RECOVER); logger.info(msgRecover); } - // check for missing content - if (!versionPropertiesContentAvailable) - { - String msg = I18NUtil.getMessage(ERR_MISSING_CONTENT); - logger.error(msg); - } // handle either content or indexes missing if (missingStoreIndexes > 0 || !versionPropertiesContentAvailable) {