Skip to content

Commit a820389

Browse files
committed
Add configurable override for s3 url
1 parent 4d77104 commit a820389

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/main/java/me/lucko/bytebin/Bytebin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public Bytebin(Configuration config) throws Exception {
186186

187187
// schedule invalidation task
188188
if (expiryHandler.hasExpiryTimes() || metrics) {
189-
this.executor.scheduleWithFixedDelay(storageHandler::runInvalidationAndRecordMetrics, 5, 60 * 5, TimeUnit.SECONDS);
189+
this.executor.scheduleWithFixedDelay(storageHandler::runInvalidationAndRecordMetrics, 5, 5, TimeUnit.MINUTES);
190190
}
191191

192192
if (config.getBoolean(Option.AUDIT_ON_STARTUP, false)) {

src/main/java/me/lucko/bytebin/content/storage/S3Backend.java

+10-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import software.amazon.awssdk.core.ResponseInputStream;
3434
import software.amazon.awssdk.core.sync.RequestBody;
3535
import software.amazon.awssdk.services.s3.S3Client;
36+
import software.amazon.awssdk.services.s3.S3ClientBuilder;
3637
import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
3738
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
3839
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
@@ -44,6 +45,7 @@
4445
import software.amazon.awssdk.services.s3.model.S3Object;
4546
import software.amazon.awssdk.services.s3.paginators.ListObjectsV2Iterable;
4647

48+
import java.net.URI;
4749
import java.util.Date;
4850
import java.util.HashMap;
4951
import java.util.Map;
@@ -68,7 +70,14 @@ public S3Backend(String backendId, String bucketName) {
6870
this.bucketName = bucketName;
6971

7072
// configure with environment variables: AWS_REGION, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
71-
this.client = S3Client.builder().build();
73+
S3ClientBuilder builder = S3Client.builder();
74+
75+
String s3EndpointUrl = System.getenv("AWS_S3_ENDPOINT_URL");
76+
if (s3EndpointUrl != null && !s3EndpointUrl.isBlank()) {
77+
builder = builder.endpointOverride(URI.create(s3EndpointUrl));
78+
}
79+
80+
this.client = builder.build();
7281
}
7382

7483
@Override

0 commit comments

Comments
 (0)