kopia lustrzana https://github.com/jortage/poolmgr
Fix blunder, Gradle 8 deprecation nonsense, compile for 11
rodzic
911c712be3
commit
fc79bb51f4
12
build.gradle
12
build.gradle
|
@ -8,8 +8,14 @@ repositories {
|
|||
mavenCentral()
|
||||
}
|
||||
|
||||
archivesBaseName = 'jortage-poolmgr'
|
||||
version = '1.4.0'
|
||||
base {
|
||||
archivesName = 'jortage-poolmgr'
|
||||
version = '1.4.1'
|
||||
}
|
||||
|
||||
compileJava {
|
||||
options.release = 11
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
main {
|
||||
|
@ -76,4 +82,4 @@ tasks.named("dependencyUpdates").configure {
|
|||
it.candidate.version.contains("alpha") || it.candidate.version.contains("beta")
|
||||
|| (it.candidate.group == 'org.slf4j' && it.candidate.version.startsWith("2."))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -324,7 +324,8 @@ public class JortageBlobStore extends ForwardingBlobStore {
|
|||
// (causes intermittent 429s on at least DigitalOcean)
|
||||
Thread.sleep(100);
|
||||
BlobMetadata meta = delegate().blobMetadata(mpu.containerName(), mpu.blobName());
|
||||
if (meta == null) {
|
||||
BlobMetadata targetMeta = delegate().blobMetadata(bucket, path);
|
||||
if (targetMeta == null) {
|
||||
Thread.sleep(100);
|
||||
etag = delegate().copyBlob(mpu.containerName(), mpu.blobName(), bucket, path, CopyOptions.builder().contentMetadata(meta.getContentMetadata()).build());
|
||||
Thread.sleep(100);
|
||||
|
@ -332,7 +333,7 @@ public class JortageBlobStore extends ForwardingBlobStore {
|
|||
Queries.putPendingBackup(dataSource, hash);
|
||||
} else {
|
||||
Thread.sleep(100);
|
||||
etag = delegate().blobMetadata(bucket, path).getETag();
|
||||
etag = targetMeta.getETag();
|
||||
}
|
||||
Queries.putMap(dataSource, identity, Preconditions.checkNotNull(meta.getUserMetadata().get("jortage-originalname")), hash);
|
||||
Queries.putFilesize(dataSource, hash, counter.getCount());
|
||||
|
|
Ładowanie…
Reference in New Issue