Skip to content

adding s3-core lib to libs #208

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

Merged
kambizzandi merged 1 commit into from
Sep 6, 2022
Merged

adding s3-core lib to libs #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions Interfaces/ObjectStorage/ObjectStorageManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ quint64 ObjectStorageManager::saveFile(
//trigger async upload to storage(s)
try {
if (QueueRowsCount > 0) {
TargomanDebug(5, "before queue ObjectStorageManager::processQueue(fileID: " << UploadedFileID << ")");
TargomanLogDebug(5, "before queue ObjectStorageManager::processQueue(fileID: " << UploadedFileID << ")");

QFuture<bool> ret = QtConcurrent::run(
ObjectStorageManager::processQueue,
stuProcessQueueParams(
Expand All @@ -196,7 +197,8 @@ quint64 ObjectStorageManager::saveFile(
UploadedFileID,
QueueRowsCount
));
TargomanDebug(5, "after queue ObjectStorageManager::processQueue(fileID: " << UploadedFileID << ")");

TargomanLogDebug(5, "after queue ObjectStorageManager::processQueue(fileID: " << UploadedFileID << ")");

#ifdef QT_DEBUG
// bool rrr = ret.result();
Expand Down Expand Up @@ -365,14 +367,14 @@ bool ObjectStorageManager::processQueue(
/************************************************************************/
/************************************************************************/
/************************************************************************/
TargomanLogDebug(5, "before ObjectStorageManager::storeFileToGateway"
<< "fileID: " << QueueInfo.UploadFiles.uflID
<< "queueID: " << QueueInfo.UploadQueue.uquID
);
// TargomanLogDebug(5, "before ObjectStorageManager::storeFileToGateway"
// << "fileID: " << QueueInfo.UploadFiles.uflID
// << "queueID: " << QueueInfo.UploadQueue.uquID
// );

Stored = ObjectStorageManager::storeFileToGateway(_processQueueParams.APICALLBOOM_PARAM, QueueInfo);

TargomanLogDebug(5, "after ObjectStorageManager::storeFileToGateway");
// TargomanLogDebug(5, "after ObjectStorageManager::storeFileToGateway");
/************************************************************************/
/************************************************************************/
/************************************************************************/
Expand Down
10 changes: 10 additions & 0 deletions Interfaces/ObjectStorage/ObjectStorageManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,16 @@ class ObjectStorageManager
quint64 UploadedFileID = 0;
quint16 MaxItemsCount = 100;

stuProcessQueueParams(const stuProcessQueueParams &_other) :
APICALLBOOM_PARAM(_other.APICALLBOOM_PARAM),
CurrentUserID(_other.CurrentUserID),
UploadFiles(_other.UploadFiles),
UploadQueue(_other.UploadQueue),
UploadGateways(_other.UploadGateways),
UploadedFileID(_other.UploadedFileID),
MaxItemsCount(_other.MaxItemsCount)
{ ; }

stuProcessQueueParams(
INTFAPICALLBOOM_DECL &_APICALLBOOM_PARAM,
quint64 _currentUserID,
Expand Down
4 changes: 2 additions & 2 deletions version.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ defined(QJsonRPC, var) equals(QJsonRPC, 1) {
}

!defined(NoAwsS3, var) | equals(NoAwsS3, 1) {
LIBS += -laws-cpp-sdk-s3
LIBS += -laws-cpp-sdk-core -laws-cpp-sdk-s3
DEFINES += TARGOMAN_API_ENABLE_AWS_S3
}

Expand All @@ -55,7 +55,7 @@ defined(JWTDastreshte, var) equals(JWTDastreshte, 1) {
}

#+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-++-+-+-
QT+= core sql network
QT += core sql network
QT -= gui
QMAKE_CXXFLAGS += -Wno-unknown-pragmas -Wno-padded

Expand Down