- Take into account the new "errorMsg" value returned by "LoaderAndChecker.getWasValidAndCouldRetry()".

- Update dependencies.
This commit is contained in:
Lampros Smyrnaios 2023-12-18 15:17:51 +02:00
parent bad9544c58
commit 066d6f665f
4 changed files with 6 additions and 5 deletions

View File

@ -47,7 +47,7 @@ dependencies {
implementation("org.apache.commons:commons-compress:1.25.0") {
exclude group: 'com.github.luben', module: 'zstd-jni'
}
implementation 'com.github.luben:zstd-jni:1.5.5-10' // Even though this is part of the above dependency, the Apache commons rarely updates it, while the zstd team makes improvements very often.
implementation 'com.github.luben:zstd-jni:1.5.5-11' // Even though this is part of the above dependency, the Apache commons rarely updates it, while the zstd team makes improvements very often.
// Also, for compressing, we strangely need it to be explicitly declared independently, otherwise it does not work.
testImplementation 'org.springframework.security:spring-security-test'

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

View File

@ -22,7 +22,7 @@ elif [[ $# -gt 2 ]]; then
echo -e "Wrong number of arguments given: ${#} (more than 2)\nPlease execute it like: script.sh <justRun: 0 | 1> <avoidReInstallingPublicationsRetriever: 0 | 1>"; exit 2
fi
gradleVersion="8.4"
gradleVersion="8.5"
shouldBeCarefulWithMaxHeap=0 # This is NOT a cmd-arg.

View File

@ -97,7 +97,7 @@ public class PublicationsRetrieverPlugin {
{
callableTasks.add(() -> {
urlsCounter[0]++;
if ( (urlsCounter[0] % 250) == 0 ) // Every 500 urls, display a "progress" message.
if ( (urlsCounter[0] % 250) == 0 ) // Every 250 urls, display a "progress" message.
logger.debug("Assignments_" + assignmentRequestCounter + " progress: will process url-" + urlsCounter[0] + " out of " + numOfAssignments);
String id = assignment.getId();
@ -142,7 +142,8 @@ public class PublicationsRetrieverPlugin {
List<String> list = LoaderAndChecker.getWasValidAndCouldRetry(e, urlToCheck);
String wasUrlValid = list.get(0);
String couldRetry = list.get(1);
UrlUtils.logOutputData(id, urlToCheck, null, UrlUtils.unreachableDocOrDatasetUrlIndicator, "Discarded at loading time, due to connectivity problems.", null, true, "true", wasUrlValid, "false", "false", couldRetry, null, null);
String errorMsg = "Discarded at loading time, as " + list.get(2);
UrlUtils.logOutputData(id, urlToCheck, null, UrlUtils.unreachableDocOrDatasetUrlIndicator, errorMsg, null, true, "true", wasUrlValid, "false", "false", couldRetry, null, null);
return false;
}
return true;