You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/05/06 17:10:38 UTC
[incubator-dlab] branch develop updated: Added logs for bucket
browser
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new f51af83 Added logs for bucket browser
f51af83 is described below
commit f51af83d22fbaf57fe615473f5f391437b0e4bb1
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Wed May 6 20:10:04 2020 +0300
Added logs for bucket browser
---
.../com/epam/dlab/backendapi/resources/BucketResource.java | 4 +---
.../dlab/backendapi/service/impl/gcp/BucketServiceGcpImpl.java | 10 ++++++----
.../com/epam/dlab/backendapi/resources/BucketResource.java | 4 +---
.../epam/dlab/backendapi/service/impl/BucketServiceImpl.java | 2 ++
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
index a44d21f..4e7d53a 100644
--- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
+++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
@@ -24,7 +24,6 @@ import com.epam.dlab.backendapi.service.BucketService;
import com.google.inject.Inject;
import io.dropwizard.auth.Auth;
import lombok.extern.slf4j.Slf4j;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
import javax.ws.rs.Consumes;
@@ -64,8 +63,7 @@ public class BucketResource {
public Response uploadObject(@Auth UserInfo userInfo,
@FormDataParam("object") String object,
@FormDataParam("bucket") String bucket,
- @FormDataParam("file") InputStream inputStream,
- @FormDataParam("file") FormDataContentDisposition fileMetaData) {
+ @FormDataParam("file") InputStream inputStream) {
bucketService.uploadObject(bucket, object, inputStream);
return Response.ok().build();
}
diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/gcp/BucketServiceGcpImpl.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/gcp/BucketServiceGcpImpl.java
index 1c17142..7eedaf5 100644
--- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/gcp/BucketServiceGcpImpl.java
+++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/gcp/BucketServiceGcpImpl.java
@@ -30,7 +30,6 @@ import com.google.cloud.storage.Storage;
import com.google.cloud.storage.StorageOptions;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -59,24 +58,27 @@ public class BucketServiceGcpImpl implements BucketService {
@Override
public void uploadObject(String bucket, String object, InputStream stream) {
+ log.info("Uploading file {} to bucket {}", object, bucket);
try {
Storage storage = StorageOptions.getDefaultInstance().getService();
BlobId blobId = BlobId.of(bucket, object);
BlobInfo blobInfo = BlobInfo.newBuilder(blobId).build();
- storage.create(blobInfo, IOUtils.toByteArray(stream));
+ storage.create(blobInfo, stream);
} catch (Exception e) {
log.error("Cannot upload object {} to bucket {}. Reason: {}", object, bucket, e.getMessage());
throw new DlabException(String.format("Cannot upload object %s to bucket %s. Reason: %s", object, bucket, e.getMessage()));
}
+ log.info("Finished uploading file {} to bucket {}", object, bucket);
}
@Override
public byte[] downloadObject(String bucket, String object) {
- try {
+ log.info("Downloading file {} from bucket {}", object, bucket);
+ try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
Storage storage = StorageOptions.getDefaultInstance().getService();
Blob blob = storage.get(BlobId.of(bucket, object));
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
blob.downloadTo(outputStream); //todo add check for blob != null and throw exception
+ log.info("Downloading uploading file {} from bucket {}", object, bucket);
return outputStream.toByteArray();
} catch (Exception e) {
log.error("Cannot download object {} from bucket {}. Reason: {}", object, bucket, e.getMessage());
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
index 7198e35..f21af2b 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
@@ -24,7 +24,6 @@ import com.epam.dlab.backendapi.service.BucketService;
import com.google.inject.Inject;
import io.dropwizard.auth.Auth;
import lombok.extern.slf4j.Slf4j;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
import javax.annotation.security.RolesAllowed;
@@ -71,8 +70,7 @@ public class BucketResource {
@FormDataParam("object") String object,
@FormDataParam("bucket") String bucket,
@FormDataParam("endpoint") String endpoint,
- @FormDataParam("file") InputStream fileInputStream,
- @FormDataParam("file") FormDataContentDisposition fileMetaData) {
+ @FormDataParam("file") InputStream fileInputStream) {
bucketService.uploadObjects(userInfo, bucket, object, endpoint, fileInputStream);
return Response.ok().build();
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java
index b7fa732..06ee456 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java
@@ -75,6 +75,7 @@ public class BucketServiceImpl implements BucketService {
@Override
public void uploadObjects(UserInfo userInfo, String bucket, String object, String endpoint, InputStream inputStream) {
+ log.info("Uploading file {} for user {} to bucket {}", object, userInfo.getName(), bucket);
try {
EndpointDTO endpointDTO = endpointService.get(endpoint);
FormDataMultiPart formData = getFormDataMultiPart(bucket, object, inputStream);
@@ -86,6 +87,7 @@ public class BucketServiceImpl implements BucketService {
log.error("Cannot upload object {} to bucket {} for user {}, endpoint {}. Reason {}", object, bucket, userInfo.getName(), endpoint, e.getMessage());
throw new DlabException(String.format("Cannot upload object %s to bucket %s for user %s, endpoint %s. Reason %s", object, bucket, userInfo.getName(), endpoint, e.getMessage()));
}
+ log.info("Finished uploading file {} for user {} to bucket {}", object, userInfo.getName(), bucket);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org