BlockStorage/repertory
1
0
Fork 0
Code Issues 8 Pull Requests Releases 6 Wiki Activity

refactor stop

Browse Source
This commit is contained in:
Scott E. Graves 2024-12-02 19:16:52 -06:00
parent ea8eb53a34
commit 4b9b095104
7 changed files with 173 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
repertory/librepertory/include/providers/base_provider.hpp
View File

@ -44,10 +44,9 @@ private:
api_item_added_callback api_item_added_; api_item_added_callback api_item_added_;
std::unique_ptr<meta_db> db3_; std::unique_ptr<meta_db> db3_;
i_file_manager *fm_{}; i_file_manager *fm_{};
std::atomic<bool> stop_requested_{false};
private: private:
void remove_deleted_files(); void remove_deleted_files(const stop_type &stop_requested);
protected: protected:
[[nodiscard]] static auto [[nodiscard]] static auto

148
repertory/librepertory/include/providers/encrypt/encrypt_provider.hpp
View File

@ -77,74 +77,68 @@ private:
const encrypt_config &cfg, const encrypt_config &cfg,
std::string &api_path) const -> bool; std::string &api_path) const -> bool;
void remove_deleted_files(); void remove_deleted_files(const stop_type &stop_requested);
public: public:
[[nodiscard]] auto create_directory(const std::string &api_path, [[nodiscard]] auto create_directory(const std::string &api_path,
api_meta_map &meta) -> api_error override; api_meta_map &meta) -> api_error override;
[[nodiscard]] auto [[nodiscard]] auto create_directory_clone_source_meta(
create_directory_clone_source_meta(const std::string & /*source_api_path*/, const std::string & /*source_api_path*/,
const std::string & /*api_path*/) const std::string & /*api_path*/) -> api_error override {
-> api_error override {
return api_error::not_implemented;
}
[[nodiscard]] auto create_file(const std::string & /*api_path*/,
api_meta_map & /*meta*/)
-> api_error override {
return api_error::not_implemented; return api_error::not_implemented;
} }
[[nodiscard]] auto [[nodiscard]] auto
get_api_path_from_source(const std::string & /*source_path*/, create_file(const std::string & /*api_path*/,
std::string & /*api_path*/) const api_meta_map & /*meta*/) -> api_error override {
-> api_error override; return api_error::not_implemented;
}
[[nodiscard]] auto get_api_path_from_source(
const std::string & /*source_path*/,
std::string & /*api_path*/) const -> api_error override;
[[nodiscard]] auto get_directory_item_count(const std::string &api_path) const [[nodiscard]] auto get_directory_item_count(const std::string &api_path) const
-> std::uint64_t override; -> std::uint64_t override;
[[nodiscard]] auto get_directory_items(const std::string &api_path, [[nodiscard]] auto
directory_item_list &list) const get_directory_items(const std::string &api_path,
-> api_error override; directory_item_list &list) const -> api_error override;
[[nodiscard]] auto get_file(const std::string &api_path, api_file &file) const [[nodiscard]] auto get_file(const std::string &api_path,
-> api_error override; api_file &file) const -> api_error override;
[[nodiscard]] auto get_file_list(api_file_list &list,
std::string &marker) const
-> api_error override;
[[nodiscard]] auto get_file_size(const std::string &api_path,
std::uint64_t &file_size) const
-> api_error override;
[[nodiscard]] auto get_filesystem_item(const std::string &api_path,
bool directory,
filesystem_item &fsi) const
-> api_error override;
[[nodiscard]] auto get_filesystem_item_and_file(const std::string &api_path,
api_file &file,
filesystem_item &fsi) const
-> api_error override;
[[nodiscard]] auto [[nodiscard]] auto
get_filesystem_item_from_source_path(const std::string &source_path, get_file_list(api_file_list &list,
filesystem_item &fsi) const std::string &marker) const -> api_error override;
-> api_error override;
[[nodiscard]] auto get_pinned_files() const [[nodiscard]] auto
-> std::vector<std::string> override; get_file_size(const std::string &api_path,
std::uint64_t &file_size) const -> api_error override;
[[nodiscard]] auto get_item_meta(const std::string &api_path, [[nodiscard]] auto
api_meta_map &meta) const get_filesystem_item(const std::string &api_path, bool directory,
-> api_error override; filesystem_item &fsi) const -> api_error override;
[[nodiscard]] auto get_item_meta(const std::string &api_path, [[nodiscard]] auto get_filesystem_item_and_file(
const std::string &key, const std::string &api_path, api_file &file,
std::string &value) const filesystem_item &fsi) const -> api_error override;
-> api_error override;
[[nodiscard]] auto get_filesystem_item_from_source_path(
const std::string &source_path,
filesystem_item &fsi) const -> api_error override;
[[nodiscard]] auto
get_pinned_files() const -> std::vector<std::string> override;
[[nodiscard]] auto
get_item_meta(const std::string &api_path,
api_meta_map &meta) const -> api_error override;
[[nodiscard]] auto
get_item_meta(const std::string &api_path, const std::string &key,
std::string &value) const -> api_error override;
[[nodiscard]] auto get_total_drive_space() const -> std::uint64_t override; [[nodiscard]] auto get_total_drive_space() const -> std::uint64_t override;
@ -159,11 +153,11 @@ public:
[[nodiscard]] auto is_directory(const std::string &api_path, [[nodiscard]] auto is_directory(const std::string &api_path,
bool &exists) const -> api_error override; bool &exists) const -> api_error override;
[[nodiscard]] auto is_file(const std::string &api_path, bool &exists) const [[nodiscard]] auto is_file(const std::string &api_path,
-> api_error override; bool &exists) const -> api_error override;
[[nodiscard]] auto is_file_writeable(const std::string &api_path) const [[nodiscard]] auto
-> bool override; is_file_writeable(const std::string &api_path) const -> bool override;
[[nodiscard]] auto is_online() const -> bool override; [[nodiscard]] auto is_online() const -> bool override;
@ -173,44 +167,42 @@ public:
return false; return false;
} }
[[nodiscard]] auto read_file_bytes(const std::string &api_path, [[nodiscard]] auto
std::size_t size, std::uint64_t offset, read_file_bytes(const std::string &api_path, std::size_t size,
data_buffer &data, std::uint64_t offset, data_buffer &data,
stop_type &stop_requested) stop_type &stop_requested) -> api_error override;
-> api_error override;
[[nodiscard]] auto remove_directory(const std::string & /*api_path*/) [[nodiscard]] auto
-> api_error override { remove_directory(const std::string & /*api_path*/) -> api_error override {
return api_error::not_implemented; return api_error::not_implemented;
} }
[[nodiscard]] auto remove_file(const std::string & /*api_path*/) [[nodiscard]] auto
-> api_error override { remove_file(const std::string & /*api_path*/) -> api_error override {
return api_error::not_implemented; return api_error::not_implemented;
} }
[[nodiscard]] auto remove_item_meta(const std::string & /*api_path*/, [[nodiscard]] auto
const std::string & /*key*/) remove_item_meta(const std::string & /*api_path*/,
-> api_error override { const std::string & /*key*/) -> api_error override {
return api_error::success; return api_error::success;
} }
[[nodiscard]] auto rename_file(const std::string & /*from_api_path*/, [[nodiscard]] auto
const std::string & /*to_api_path*/) rename_file(const std::string & /*from_api_path*/,
-> api_error override { const std::string & /*to_api_path*/) -> api_error override {
return api_error::not_implemented; return api_error::not_implemented;
} }
[[nodiscard]] auto set_item_meta(const std::string & /*api_path*/, [[nodiscard]] auto
const std::string & /*key*/, set_item_meta(const std::string & /*api_path*/, const std::string & /*key*/,
const std::string & /*value*/) const std::string & /*value*/) -> api_error override {
-> api_error override {
return api_error::success; return api_error::success;
} }
[[nodiscard]] auto set_item_meta(const std::string & /*api_path*/, [[nodiscard]] auto
const api_meta_map & /*meta*/) set_item_meta(const std::string & /*api_path*/,
-> api_error override { const api_meta_map & /*meta*/) -> api_error override {
return api_error::success; return api_error::success;
} }
@ -219,10 +211,10 @@ public:
void stop() override; void stop() override;
[[nodiscard]] auto upload_file(const std::string & /*api_path*/, [[nodiscard]] auto
upload_file(const std::string & /*api_path*/,
const std::string & /*source_path*/, const std::string & /*source_path*/,
stop_type & /*stop_requested*/) stop_type & /*stop_requested*/) -> api_error override {
-> api_error override {
return api_error::not_implemented; return api_error::not_implemented;
} }
}; };

6
repertory/librepertory/include/utils/polling.hpp
View File

@ -37,7 +37,7 @@ public:
struct polling_item { struct polling_item {
std::string name; std::string name;
frequency freq; frequency freq;
std::function<void()> action; std::function<void(const stop_type &stop_requested)> action;
}; };
public: public:
@ -58,7 +58,7 @@ public:
static auto instance() -> polling & { return instance_; } static auto instance() -> polling & { return instance_; }
private: private:
app_config *config_ = nullptr; app_config *config_{nullptr};
std::unique_ptr<std::thread> high_frequency_thread_; std::unique_ptr<std::thread> high_frequency_thread_;
std::unordered_map<std::string, polling_item> items_; std::unordered_map<std::string, polling_item> items_;
std::unique_ptr<std::thread> low_frequency_thread_; std::unique_ptr<std::thread> low_frequency_thread_;
@ -66,7 +66,7 @@ private:
std::condition_variable notify_; std::condition_variable notify_;
std::unique_ptr<std::thread> second_frequency_thread_; std::unique_ptr<std::thread> second_frequency_thread_;
std::mutex start_stop_mutex_; std::mutex start_stop_mutex_;
stop_type stop_requested_ = false; stop_type stop_requested_{false};
private: private:
void frequency_thread(std::function<std::uint32_t()> get_frequency_seconds, void frequency_thread(std::function<std::uint32_t()> get_frequency_seconds,

25
repertory/librepertory/src/file_manager/file_manager.cpp
View File

@ -43,8 +43,8 @@
#include "utils/time.hpp" #include "utils/time.hpp"
namespace { namespace {
[[nodiscard]] auto create_resume_entry(const repertory::i_open_file &file) [[nodiscard]] auto
-> json { create_resume_entry(const repertory::i_open_file &file) -> json {
return { return {
{"chunk_size", file.get_chunk_size()}, {"chunk_size", file.get_chunk_size()},
{"path", file.get_api_path()}, {"path", file.get_api_path()},
@ -447,11 +447,10 @@ auto file_manager::open(const std::string &api_path, bool directory,
return open(api_path, directory, ofd, handle, file, nullptr); return open(api_path, directory, ofd, handle, file, nullptr);
} }
auto file_manager::open(const std::string &api_path, bool directory, auto file_manager::open(
const open_file_data &ofd, std::uint64_t &handle, const std::string &api_path, bool directory, const open_file_data &ofd,
std::shared_ptr<i_open_file> &file, std::uint64_t &handle, std::shared_ptr<i_open_file> &file,
std::shared_ptr<i_closeable_open_file> closeable_file) std::shared_ptr<i_closeable_open_file> closeable_file) -> api_error {
-> api_error {
const auto create_and_add_handle = const auto create_and_add_handle =
[&](std::shared_ptr<i_closeable_open_file> cur_file) { [&](std::shared_ptr<i_closeable_open_file> cur_file) {
handle = get_next_handle(); handle = get_next_handle();
@ -699,8 +698,8 @@ auto file_manager::rename_directory(const std::string &from_api_path,
} }
auto file_manager::rename_file(const std::string &from_api_path, auto file_manager::rename_file(const std::string &from_api_path,
const std::string &to_api_path, bool overwrite) const std::string &to_api_path,
-> api_error { bool overwrite) -> api_error {
if (not provider_.is_rename_supported()) { if (not provider_.is_rename_supported()) {
return api_error::not_implemented; return api_error::not_implemented;
} }
@ -780,9 +779,11 @@ void file_manager::start() {
stop_requested_ = false; stop_requested_ = false;
polling::instance().set_callback( polling::instance().set_callback({"timed_out_close",
{"timed_out_close", polling::frequency::second, polling::frequency::second,
[this]() { this->close_timed_out_files(); }}); [this](auto && /* stop_requested */) {
this->close_timed_out_files();
}});
if (provider_.is_read_only()) { if (provider_.is_read_only()) {
stop_requested_ = false; stop_requested_ = false;

21
repertory/librepertory/src/providers/base_provider.cpp
View File

@ -413,14 +413,14 @@ auto base_provider::is_file_writeable(const std::string &api_path) const
return not exists; return not exists;
} }
void base_provider::remove_deleted_files() { void base_provider::remove_deleted_files(const stop_type &stop_requested) {
REPERTORY_USES_FUNCTION_NAME(); REPERTORY_USES_FUNCTION_NAME();
if (not is_read_only()) { if (not is_read_only()) {
auto source_list = auto source_list =
utils::file::directory{config_.get_cache_directory()}.get_files(); utils::file::directory{config_.get_cache_directory()}.get_files();
for (auto &&source_file : source_list) { for (auto &&source_file : source_list) {
if (stop_requested_) { if (stop_requested) {
return; return;
} }
@ -466,7 +466,7 @@ void base_provider::remove_deleted_files() {
api_file_list list{}; api_file_list list{};
std::string marker; std::string marker;
auto res{api_error::more_data}; auto res{api_error::more_data};
while (not stop_requested_ && res == api_error::more_data) { while (not stop_requested && res == api_error::more_data) {
res = get_file_list(list, marker); res = get_file_list(list, marker);
if (res != api_error::success && res != api_error::more_data) { if (res != api_error::success && res != api_error::more_data) {
utils::error::raise_error(function_name, res, utils::error::raise_error(function_name, res,
@ -478,7 +478,7 @@ void base_provider::remove_deleted_files() {
std::vector<removed_item> removed_list{}; std::vector<removed_item> removed_list{};
for (auto &&api_path : db3_->get_api_path_list()) { for (auto &&api_path : db3_->get_api_path_list()) {
if (stop_requested_) { if (stop_requested) {
return; return;
} }
@ -516,7 +516,7 @@ void base_provider::remove_deleted_files() {
utils::path::combine(config_.get_data_directory(), {"orphaned"}); utils::path::combine(config_.get_data_directory(), {"orphaned"});
for (auto &&item : removed_list) { for (auto &&item : removed_list) {
if (stop_requested_) { if (stop_requested) {
return; return;
} }
@ -569,7 +569,7 @@ void base_provider::remove_deleted_files() {
} }
for (auto &&item : removed_list) { for (auto &&item : removed_list) {
if (stop_requested_) { if (stop_requested) {
return; return;
} }
@ -678,8 +678,6 @@ auto base_provider::set_item_meta(const std::string &api_path,
auto base_provider::start(api_item_added_callback api_item_added, auto base_provider::start(api_item_added_callback api_item_added,
i_file_manager *mgr) -> bool { i_file_manager *mgr) -> bool {
stop_requested_ = false;
api_item_added_ = api_item_added; api_item_added_ = api_item_added;
fm_ = mgr; fm_ = mgr;
@ -714,13 +712,14 @@ auto base_provider::start(api_item_added_callback api_item_added,
return false; return false;
} }
polling::instance().set_callback({"check_deleted", polling::frequency::low, polling::instance().set_callback(
[this]() { remove_deleted_files(); }}); {"check_deleted", polling::frequency::low, [this](auto &&stop_requested) {
remove_deleted_files(stop_requested);
}});
return true; return true;
} }
void base_provider::stop() { void base_provider::stop() {
stop_requested_ = true;
polling::instance().remove_callback("check_deleted"); polling::instance().remove_callback("check_deleted");
db3_.reset(); db3_.reset();
} }

89
repertory/librepertory/src/providers/encrypt/encrypt_provider.cpp
View File

@ -69,10 +69,9 @@ const std::map<std::string, std::string> sql_create_tables = {
namespace repertory { namespace repertory {
encrypt_provider::encrypt_provider(app_config &config) : config_(config) {} encrypt_provider::encrypt_provider(app_config &config) : config_(config) {}
auto encrypt_provider::create_api_file(const std::string &api_path, auto encrypt_provider::create_api_file(
bool directory, const std::string &api_path, bool directory,
const std::string &source_path) const std::string &source_path) -> api_file {
-> api_file {
auto times = utils::file::get_times(source_path); auto times = utils::file::get_times(source_path);
if (not times.has_value()) { if (not times.has_value()) {
throw std::runtime_error("failed to get file times"); throw std::runtime_error("failed to get file times");
@ -98,10 +97,10 @@ auto encrypt_provider::create_api_file(const std::string &api_path,
void encrypt_provider::create_item_meta(api_meta_map &meta, bool directory, void encrypt_provider::create_item_meta(api_meta_map &meta, bool directory,
const api_file &file) { const api_file &file) {
#if defined(_WIN32) #if defined(_WIN32)
struct _stat64 buf{}; struct _stat64 buf {};
_stat64(file.source_path.c_str(), &buf); _stat64(file.source_path.c_str(), &buf);
#else // !defined(_WIN32) #else // !defined(_WIN32)
struct stat buf{}; struct stat buf {};
stat(file.source_path.c_str(), &buf); stat(file.source_path.c_str(), &buf);
#endif // defined(_WIN32) #endif // defined(_WIN32)
@ -188,9 +187,8 @@ auto encrypt_provider::do_fs_operation(
return callback(cfg, source_path); return callback(cfg, source_path);
} }
auto encrypt_provider::get_api_path_from_source(const std::string &source_path, auto encrypt_provider::get_api_path_from_source(
std::string &api_path) const const std::string &source_path, std::string &api_path) const -> api_error {
-> api_error {
REPERTORY_USES_FUNCTION_NAME(); REPERTORY_USES_FUNCTION_NAME();
try { try {
@ -255,9 +253,8 @@ auto encrypt_provider::get_directory_item_count(
return count; return count;
} }
auto encrypt_provider::get_directory_items(const std::string &api_path, auto encrypt_provider::get_directory_items(
directory_item_list &list) const const std::string &api_path, directory_item_list &list) const -> api_error {
-> api_error {
REPERTORY_USES_FUNCTION_NAME(); REPERTORY_USES_FUNCTION_NAME();
return do_fs_operation( return do_fs_operation(
@ -405,9 +402,8 @@ auto encrypt_provider::get_file(const std::string &api_path,
return api_error::error; return api_error::error;
} }
auto encrypt_provider::get_file_list(api_file_list &list, auto encrypt_provider::get_file_list(
std::string & /* marker */) const api_file_list &list, std::string & /* marker */) const -> api_error {
-> api_error {
REPERTORY_USES_FUNCTION_NAME(); REPERTORY_USES_FUNCTION_NAME();
const auto cfg = config_.get_encrypt_config(); const auto cfg = config_.get_encrypt_config();
@ -430,9 +426,8 @@ auto encrypt_provider::get_file_list(api_file_list &list,
return api_error::error; return api_error::error;
} }
auto encrypt_provider::get_file_size(const std::string &api_path, auto encrypt_provider::get_file_size(
std::uint64_t &file_size) const const std::string &api_path, std::uint64_t &file_size) const -> api_error {
-> api_error {
REPERTORY_USES_FUNCTION_NAME(); REPERTORY_USES_FUNCTION_NAME();
try { try {
@ -458,10 +453,9 @@ auto encrypt_provider::get_file_size(const std::string &api_path,
return api_error::error; return api_error::error;
} }
auto encrypt_provider::get_filesystem_item(const std::string &api_path, auto encrypt_provider::get_filesystem_item(
bool directory, const std::string &api_path, bool directory,
filesystem_item &fsi) const filesystem_item &fsi) const -> api_error {
-> api_error {
auto result = utils::db::sqlite::db_select{*db_, source_table} auto result = utils::db::sqlite::db_select{*db_, source_table}
.column("source_path") .column("source_path")
.where("api_path") .where("api_path")
@ -537,10 +531,9 @@ auto encrypt_provider::get_filesystem_item_from_source_path(
return get_filesystem_item(api_path, false, fsi); return get_filesystem_item(api_path, false, fsi);
} }
auto encrypt_provider::get_filesystem_item_and_file(const std::string &api_path, auto encrypt_provider::get_filesystem_item_and_file(
api_file &file, const std::string &api_path, api_file &file,
filesystem_item &fsi) const filesystem_item &fsi) const -> api_error {
-> api_error {
REPERTORY_USES_FUNCTION_NAME(); REPERTORY_USES_FUNCTION_NAME();
try { try {
@ -667,8 +660,8 @@ auto encrypt_provider::is_directory(const std::string &api_path,
return api_error::success; return api_error::success;
} }
auto encrypt_provider::is_file(const std::string &api_path, bool &exists) const auto encrypt_provider::is_file(const std::string &api_path,
-> api_error { bool &exists) const -> api_error {
auto result = utils::db::sqlite::db_select{*db_, source_table} auto result = utils::db::sqlite::db_select{*db_, source_table}
.column("source_path") .column("source_path")
.where("api_path") .where("api_path")
@ -954,11 +947,11 @@ auto encrypt_provider::read_file_bytes(const std::string &api_path,
return api_error::success; return api_error::success;
} }
void encrypt_provider::remove_deleted_files() { void encrypt_provider::remove_deleted_files(const stop_type &stop_requested) {
struct removed_item { struct removed_item {
std::string api_path{}; std::string api_path;
bool directory{}; bool directory{};
std::string source_path{}; std::string source_path;
}; };
std::vector<removed_item> removed_list{}; std::vector<removed_item> removed_list{};
@ -966,6 +959,10 @@ void encrypt_provider::remove_deleted_files() {
auto result = utils::db::sqlite::db_select{*db_, source_table}.go(); auto result = utils::db::sqlite::db_select{*db_, source_table}.go();
while (result.has_row()) { while (result.has_row()) {
if (stop_requested) {
return;
}
std::optional<utils::db::sqlite::db_result::row> row; std::optional<utils::db::sqlite::db_result::row> row;
if (result.get_row(row) && row.has_value()) { if (result.get_row(row) && row.has_value()) {
row_list.push_back(row.value()); row_list.push_back(row.value());
@ -973,6 +970,10 @@ void encrypt_provider::remove_deleted_files() {
} }
for (auto &&row : row_list) { for (auto &&row : row_list) {
if (stop_requested) {
return;
}
auto source_path = row.get_column("source_path").get_value<std::string>(); auto source_path = row.get_column("source_path").get_value<std::string>();
if (not utils::path::exists(source_path)) { if (not utils::path::exists(source_path)) {
auto api_path = row.get_column("api_path").get_value<std::string>(); auto api_path = row.get_column("api_path").get_value<std::string>();
@ -987,7 +988,14 @@ void encrypt_provider::remove_deleted_files() {
} }
for (auto &&item : removed_list) { for (auto &&item : removed_list) {
if (not item.directory) { if (stop_requested) {
return;
}
if (item.directory) {
continue;
}
auto del_res = utils::db::sqlite::db_delete{*db_, source_table} auto del_res = utils::db::sqlite::db_delete{*db_, source_table}
.where("api_path") .where("api_path")
.equals(item.api_path) .equals(item.api_path)
@ -1001,11 +1009,17 @@ void encrypt_provider::remove_deleted_files() {
event_system::instance().raise<file_removed_externally>(item.api_path, event_system::instance().raise<file_removed_externally>(item.api_path,
item.source_path); item.source_path);
} }
}
for (auto &&item : removed_list) { for (auto &&item : removed_list) {
if (item.directory) { if (stop_requested) {
return;
}
if (not item.directory) {
continue;
}
auto del_res = utils::db::sqlite::db_delete{*db_, source_table} auto del_res = utils::db::sqlite::db_delete{*db_, source_table}
.where("api_path") .where("api_path")
.equals(item.api_path) .equals(item.api_path)
.go(); .go();
@ -1018,7 +1032,6 @@ void encrypt_provider::remove_deleted_files() {
event_system::instance().raise<directory_removed_externally>( event_system::instance().raise<directory_removed_externally>(
item.api_path, item.source_path); item.api_path, item.source_path);
} }
}
} }
auto encrypt_provider::start(api_item_added_callback /*api_item_added*/, auto encrypt_provider::start(api_item_added_callback /*api_item_added*/,
@ -1066,8 +1079,10 @@ auto encrypt_provider::start(api_item_added_callback /*api_item_added*/,
// TODO error handling // TODO error handling
} }
polling::instance().set_callback({"check_deleted", polling::frequency::low, polling::instance().set_callback(
[this]() { remove_deleted_files(); }}); {"check_deleted", polling::frequency::low, [this](auto &&stop_requested) {
remove_deleted_files(stop_requested);
}});
event_system::instance().raise<service_started>("encrypt_provider"); event_system::instance().raise<service_started>("encrypt_provider");
return true; return true;

2
repertory/librepertory/src/utils/polling.cpp
View File

@ -39,7 +39,7 @@ void polling::frequency_thread(
freq != frequency::second) { freq != frequency::second) {
event_system::instance().raise<polling_item_begin>(item.first); event_system::instance().raise<polling_item_begin>(item.first);
} }
item.second.action(); item.second.action(stop_requested_);
if (config_->get_event_level() == event_level::trace || if (config_->get_event_level() == event_level::trace ||
freq != frequency::second) { freq != frequency::second) {
event_system::instance().raise<polling_item_end>(item.first); event_system::instance().raise<polling_item_end>(item.first);