diff --git a/repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java b/repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java index 0ebf21a085..cd6f3faded 100644 --- a/repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java +++ b/repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -107,7 +107,6 @@ public class CombinedConfig extends CombinedTransformConfig String url = baseUrl + (baseUrl.endsWith("/") ? "" : "/") + "transform/config"; HttpGet httpGet = new HttpGet(url); boolean successReadingConfig = true; - boolean logAsDebug = false; try { try (CloseableHttpClient httpclient = HttpClients.createDefault()) @@ -160,7 +159,6 @@ public class CombinedConfig extends CombinedTransformConfig } catch (IOException e) { - logAsDebug = true; throw new AlfrescoRuntimeException("Failed to connect or to read the response from "+remoteType+ " on " + url, e); } @@ -172,15 +170,7 @@ public class CombinedConfig extends CombinedTransformConfig } catch (AlfrescoRuntimeException e) { - String message = e.getMessage(); - if (logAsDebug) - { - log.debug(message); - } - else - { - log.error(message); - } + log.error(e.getMessage()); successReadingConfig = false; } return successReadingConfig; diff --git a/repository/src/main/resources/alfresco/repository.properties b/repository/src/main/resources/alfresco/repository.properties index 73f5d52a81..e719a02435 100644 --- a/repository/src/main/resources/alfresco/repository.properties +++ b/repository/src/main/resources/alfresco/repository.properties @@ -979,21 +979,21 @@ people.search.honor.hint.useCQ=true # Delays cron jobs after bootstrap to allow server to fully come up before jobs start system.cronJob.startDelayMilliseconds=60000 -# Schedule for reading mimetype config definitions dynamically. Initially checks every 10 seconds and then switches to +# Schedule for reading mimetype config definitions dynamically. Initially checks every minute and then switches to # every hour after the configuration is read successfully. If there is a error later reading the config, the -# checks return to every 10 seconds. +# checks return to every minute. mimetype.config.cronExpression=0 30 0/1 * * ? -mimetype.config.initialAndOnError.cronExpression=0/10 * * * * ? +mimetype.config.initialAndOnError.cronExpression=0 * * * * ? # Optional property to specify an external file or directory that will be read for mimetype definitions from YAML # files (possibly added to a volume via k8 ConfigMaps). mimetype.config.dir=shared/classes/alfresco/extension/mimetypes -# Schedule for reading rendition config definitions dynamically. Initially checks every 10 seconds and then switches to +# Schedule for reading rendition config definitions dynamically. Initially checks every minute and then switches to # every hour after the configuration is read successfully. If there is a error later reading the config, the -# checks return to every 10 seconds. +# checks return to every minute. rendition.config.cronExpression=2 30 0/1 * * ? -rendition.config.initialAndOnError.cronExpression=0/10 * * * * ? +rendition.config.initialAndOnError.cronExpression=0 * * * * ? # Optional property to specify an external file or directory that will be read for rendition definitions from YAML # files (possibly added to a volume via k8 ConfigMaps). @@ -1006,11 +1006,11 @@ local.transform.pipeline.config.dir=shared/classes/alfresco/extension/transform/ local.transform.service.enabled=true # Schedule for reading local transform config, so that T-Engines and local pipeline config is dynamically -# picked up, or reintegrated after an outage. Initially checks every 10 seconds and then switches to every hour +# picked up, or reintegrated after an outage. Initially checks every minute and then switches to every hour # after the configuration is read successfully. If there is a error later reading the config, the checks return to -# every 10 seconds. +# every minute. local.transform.service.cronExpression=4 30 0/1 * * ? -local.transform.service.initialAndOnError.cronExpression=0/10 * * * * ? +local.transform.service.initialAndOnError.cronExpression=0 * * * * ? # # Check that the declared mimetype (of the Node) is the same as the derived