Skip to content

make upload sync #209

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 7, 2022
Merged

make upload sync #209

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
4 changes: 2 additions & 2 deletions Docker/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ RUN qmake-qt5 QJsonRPC=0 CONFIG+=debug GIT_VERSION=$TAG && make -j 4
FROM targoman/api-devel:1 as builder-mt
COPY ./MT/ .
RUN qmake-qt5 QJsonRPC=0 CONFIG+=debug GIT_VERSION=$TAG && make -j 4 && rm -rf out/build out/submodules/ out/unitTest out/test
#FROM targoman/api-devel:1-build
FROM targoman/api-devel:1
FROM targoman/api-devel:1-build
#FROM targoman/api-devel:1


###RUN zypper ar --no-gpgcheck https://download.opensuse.org/repositories/home:/targoman/15.3/home:targoman.repo
Expand Down
13 changes: 13 additions & 0 deletions Interfaces/ObjectStorage/ObjectStorageManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ quint64 ObjectStorageManager::saveFile(
if (QueueRowsCount > 0) {
TargomanLogDebug(5, "before queue ObjectStorageManager::processQueue(fileID: " << UploadedFileID << ")");

#if 0
QFuture<bool> ret = QtConcurrent::run(
ObjectStorageManager::processQueue,
stuProcessQueueParams(
Expand All @@ -197,7 +198,19 @@ quint64 ObjectStorageManager::saveFile(
UploadedFileID,
QueueRowsCount
));
#else
ObjectStorageManager::processQueue(
stuProcessQueueParams(
APICALLBOOM_PARAM,
APICALLBOOM_PARAM.getActorID(),
_uploadFiles,
_uploadQueue,
_uploadGateways,
UploadedFileID,
QueueRowsCount
));

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

#ifdef QT_DEBUG
Expand Down