Skip to content
Snippets Groups Projects
Commit 3a6c47cb authored by Sergey Yakubov's avatar Sergey Yakubov
Browse files

fix always deleting files bug

parent f7bb3fc7
No related branches found
No related tags found
No related merge requests found
......@@ -57,6 +57,9 @@ void ProcessAfterSend(asapo::GenericRequestHeader header, asapo::Error err) {
return;
}
auto config = GetEventMonConfig();
if (!config->remove_after_send) {
return;
}
std::string fname = config->root_monitored_folder + asapo::kPathSeparator + header.message;
auto error = io->RemoveFile(fname);
if (error) {
......
......@@ -52,3 +52,7 @@ echo hello > /tmp/asapo/test_in/test1/file2
echo hello > /tmp/asapo/test_in/test2/file2
$2 ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 1000 1 | tee /dev/stderr | grep "Processed 3 file(s)"
test ! -f /tmp/asapo/test_in/test1/file1
test ! -f /tmp/asapo/test_in/test1/file2
test ! -f /tmp/asapo/test_in/test2/file2
......@@ -56,3 +56,7 @@ $2 ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 2000 1 1 > out
cat out
cat out | grep "Processed 1 dataset(s)"
cat out | grep "with 3 file(s)"
test -f /tmp/asapo/test_in/test1/file1
test -f /tmp/asapo/test_in/test1/file2
test -f /tmp/asapo/test_in/test2/file2
......@@ -8,7 +8,7 @@
"RootMonitoredFolder":"@ROOT_PATH@test_in",
"MonitoredSubFolders":["test1","test2"],
"IgnoreExtentions":["tmp"],
"RemoveAfterSend":true,
"RemoveAfterSend":false,
"Subset": {
"Mode":"batch",
"BatchSize":3
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment