diff --git a/producer/event_monitor_producer/src/shared_event_list.cpp b/producer/event_monitor_producer/src/shared_event_list.cpp index 8787ead8515b393d9ed7816847f6d6b6217856bd..286165cd743240873f56f06d44f82611cb7fe5ee 100644 --- a/producer/event_monitor_producer/src/shared_event_list.cpp +++ b/producer/event_monitor_producer/src/shared_event_list.cpp @@ -1,4 +1,5 @@ #include "shared_event_list.h" +#include "eventmon_logger.h" #include <algorithm> @@ -13,6 +14,7 @@ FilesToSend SharedEventList::GetAndClearEvents() { uint64_t elapsed_ms = std::chrono::duration_cast<std::chrono::milliseconds>( high_resolution_clock::now() - it->time).count(); if (!it->apply_delay || elapsed_ms > kFileDelayMs) { + GetDefaultEventMonLogger()->Debug("file considered closed or file moved: " + it->file_name); events.push_back(it->file_name); it = events_.erase(it); } else { diff --git a/producer/event_monitor_producer/src/single_folder_watch_windows.cpp b/producer/event_monitor_producer/src/single_folder_watch_windows.cpp index 8f0010fab57301ec404deca9075403ed1cd946de..0453c4ea94a3fd19686256bd9b74468a208f91fa 100644 --- a/producer/event_monitor_producer/src/single_folder_watch_windows.cpp +++ b/producer/event_monitor_producer/src/single_folder_watch_windows.cpp @@ -27,6 +27,7 @@ Error SingleFolderWatch::Init() { this->log__->Error("cannot add folder watch for " + full_path + ": " + err->Explain()); return err; } + GetDefaultEventMonLogger()->Debug("added folder to monitor: " + full_path); return nullptr; } @@ -53,9 +54,11 @@ Error SingleFolderWatch::ProcessEvent(const WinEvent& event) { if (watch_io__->IsDirectory(root_folder_ + kPathSeparator + fname)) { return nullptr; } + GetDefaultEventMonLogger()->Debug("file modified event: " + fname); event_list_->AddEvent(fname, event.ShouldBeProcessedAfterDelay()); return nullptr; } + void SingleFolderWatch::ProcessEvents(DWORD bytes_to_read) { for (char* p = buffer_.get(); p < buffer_.get() + bytes_to_read; ) { WinEvent event{(FILE_NOTIFY_INFORMATION*) p}; diff --git a/tests/manual/tests_via_nomad/asapo-test_filegen_filemon.nomad b/tests/manual/tests_via_nomad/asapo-test_filegen_filemon.nomad index c5181c44bac5d2d960fd4d8f154398accc23b828..6ea2313dc6130d8462d884828da7454757ab72c8 100644 --- a/tests/manual/tests_via_nomad/asapo-test_filegen_filemon.nomad +++ b/tests/manual/tests_via_nomad/asapo-test_filegen_filemon.nomad @@ -20,9 +20,10 @@ job "asapo-test" { command = "local/filegen_win.exe" args = [ "1", - "1M", - "10", - "c:/tmp/asapo/test_in/test_folder/file_win"] + "10M", + "10000", + "120", + "u:/asapo/test_folder/file_win"] } artifact { @@ -57,9 +58,10 @@ job "asapo-test" { command = "local/filegen_linux" args = [ "1", - "1M", - "10", - "/tmp/asapo/test_in/test_folder/file_lin_"] + "10M", + "10000", + "120", + "/tmp/asapo/test_in/test_folder/file_lin"] } artifact { @@ -100,13 +102,13 @@ job "asapo-test" { "30000"] } - resources { - cpu = 5000 - memory = 128 - network { - mbits = 10000 - } - } +# resources { +# cpu = 5000 +# memory = 128 +# network { +# mbits = 10000 +# } +# } artifact { source = "http://nims.desy.de/extra/asapo/getnext_broker" @@ -144,13 +146,13 @@ job "asapo-test" { "yzgAcLmijSLWIm8dBiGNCbc0i42u5HSm-zR6FRqo__Y=", "30000"] } - resources { - cpu = 5000 - memory = 128 - network { - mbits = 10000 - } - } +# resources { +# cpu = 5000 +# memory = 128 +# network { +# mbits = 10000 +# } +# } artifact { source = "http://nims.desy.de/extra/asapo/getnext_broker" diff --git a/tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad b/tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad index eb22e67a00db405f26d60bfba1a36980dafbc028..fcde0f3442f59396c0bd793f89dec6ac922f8d1d 100644 --- a/tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad +++ b/tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad @@ -36,7 +36,7 @@ job "asapo-filemon-producer" { "Mode":"tcp", "NThreads":8, "LogLevel":"debug", - "RootMonitoredFolder":"c:\\tmp\\asapo\\test_in", + "RootMonitoredFolder":"u:\\asapo", "MonitoredSubFolders":["test_folder"], "IgnoreExtentions":["tmp"], "RemoveAfterSend":true