Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Improvement][RemoteLogging] Move init into loghandler #15780

Merged
merged 2 commits into from
Mar 31, 2024
Merged

[Improvement][RemoteLogging] Move init into loghandler #15780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
627f389
[RemoteLogging] Move init into loghandler
pegasas Mar 29, 2024
ec764c6
Merge branch 'dev' into loghandler
qE0a44OX6s Mar 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions ...mmon/src/main/java/org/apache/dolphinscheduler/common/log/remote/GcsRemoteLogHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,6 @@ public class GcsRemoteLogHandler implements RemoteLogHandler, Closeable {
private static GcsRemoteLogHandler instance;

private GcsRemoteLogHandler() {

}

public static synchronized GcsRemoteLogHandler getInstance() {
if (instance == null) {
instance = new GcsRemoteLogHandler();
instance.init();
}

return instance;
}

public void init() {
try {
credential = readCredentials();
bucketName = readBucketName();
Expand All @@ -73,6 +60,14 @@ public void init() {
}
}

public static synchronized GcsRemoteLogHandler getInstance() {
if (instance == null) {
instance = new GcsRemoteLogHandler();
}

return instance;
}

@Override
public void close() throws IOException {
try {
Expand Down
17 changes: 6 additions & 11 deletions ...mmon/src/main/java/org/apache/dolphinscheduler/common/log/remote/OssRemoteLogHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,23 @@ public class OssRemoteLogHandler implements RemoteLogHandler, Closeable {
private static OssRemoteLogHandler instance;

private OssRemoteLogHandler() {
String accessKeyId = readOssAccessKeyId();
String accessKeySecret = readOssAccessKeySecret();
String endpoint = readOssEndpoint();
ossClient = OssClientFactory.buildOssClient(new OssConnection(accessKeyId, accessKeySecret, endpoint));

bucketName = readOssBucketName();
checkBucketNameExists(bucketName);
}

public static synchronized OssRemoteLogHandler getInstance() {
if (instance == null) {
instance = new OssRemoteLogHandler();
instance.init();
}

return instance;
}

public void init() {
String accessKeyId = readOssAccessKeyId();
String accessKeySecret = readOssAccessKeySecret();
String endpoint = readOssEndpoint();
ossClient = OssClientFactory.buildOssClient(new OssConnection(accessKeyId, accessKeySecret, endpoint));

bucketName = readOssBucketName();
checkBucketNameExists(bucketName);
}

@Override
public void sendRemoteLog(String logPath) {
String objectName = RemoteLogUtils.getObjectNameFromLogPath(logPath);
Expand Down
19 changes: 7 additions & 12 deletions ...ommon/src/main/java/org/apache/dolphinscheduler/common/log/remote/S3RemoteLogHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,28 +56,23 @@ public class S3RemoteLogHandler implements RemoteLogHandler, Closeable {
private static S3RemoteLogHandler instance;

private S3RemoteLogHandler() {

accessKeyId = readAccessKeyID();
accessKeySecret = readAccessKeySecret();
region = readRegion();
bucketName = readBucketName();
endPoint = readEndPoint();
s3Client = buildS3Client();
checkBucketNameExists(bucketName);
}

public static synchronized S3RemoteLogHandler getInstance() {
if (instance == null) {
instance = new S3RemoteLogHandler();
instance.init();
}

return instance;
}

public void init() {
accessKeyId = readAccessKeyID();
accessKeySecret = readAccessKeySecret();
region = readRegion();
bucketName = readBucketName();
endPoint = readEndPoint();
s3Client = buildS3Client();
checkBucketNameExists(bucketName);
}

protected AmazonS3 buildS3Client() {
if (StringUtils.isNotEmpty(endPoint)) {
return AmazonS3ClientBuilder
Expand Down
Loading