2.0.0-rc (#9)
Some checks failed
BlockStorage/repertory_osx/pipeline/head This commit looks good
BlockStorage/repertory_windows/pipeline/head This commit looks good
BlockStorage/repertory/pipeline/head There was a failure building this commit
BlockStorage/repertory_linux_builds/pipeline/head This commit looks good
BlockStorage/repertory_osx_builds/pipeline/head There was a failure building this commit
Some checks failed
BlockStorage/repertory_osx/pipeline/head This commit looks good
BlockStorage/repertory_windows/pipeline/head This commit looks good
BlockStorage/repertory/pipeline/head There was a failure building this commit
BlockStorage/repertory_linux_builds/pipeline/head This commit looks good
BlockStorage/repertory_osx_builds/pipeline/head There was a failure building this commit
### Issues * \#1 \[bug\] Unable to mount S3 due to 'item_not_found' exception * \#2 Require bucket name for S3 mounts * \#3 \[bug\] File size is not being updated in S3 mount * \#4 Upgrade to libfuse-3.x.x * \#5 Switch to renterd for Sia support * \#6 Switch to cpp-httplib to further reduce dependencies * \#7 Remove global_data and calculate used disk space per provider * \#8 Switch to libcurl for S3 mount support ### Changes from v1.x.x * Added read-only encrypt provider * Pass-through mount point that transparently encrypts source data using `XChaCha20-Poly1305` * Added S3 encryption support via `XChaCha20-Poly1305` * Added replay protection to remote mounts * Added support base64 writes in remote FUSE * Created static linked Linux binaries for `amd64` and `aarch64` using `musl-libc` * Removed legacy Sia renter support * Removed Skynet support * Fixed multiple remote mount WinFSP API issues on \*NIX servers * Implemented chunked read and write * Writes for non-cached files are performed in chunks of 8Mib * Removed `repertory-ui` support * Removed `FreeBSD` support * Switched to `libsodium` over `CryptoPP` * Switched to `XChaCha20-Poly1305` for remote mounts * Updated `GoogleTest` to v1.14.0 * Updated `JSON for Modern C++` to v3.11.2 * Updated `OpenSSL` to v1.1.1w * Updated `RocksDB` to v8.5.3 * Updated `WinFSP` to 2023 * Updated `boost` to v1.78.0 * Updated `cURL` to v8.3.0 * Updated `zlib` to v1.3 * Use `upload_manager` for all providers * Adds a delay to uploads to prevent excessive API calls * Supports re-upload after mount restart for incomplete uploads * NOTE: Uploads for all providers are full file (no resume support) * Multipart upload support is planned for S3 Reviewed-on: #9
This commit is contained in:
@ -1,74 +1,106 @@
|
||||
/*
|
||||
Copyright <2018-2022> <scott.e.graves@protonmail.com>
|
||||
Copyright <2018-2023> <scott.e.graves@protonmail.com>
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
|
||||
associated documentation files (the "Software"), to deal in the Software without restriction,
|
||||
including without limitation the rights to use, copy, modify, merge, publish, distribute,
|
||||
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or
|
||||
substantial portions of the Software.
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
|
||||
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
||||
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
|
||||
OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
*/
|
||||
#include "events/consumers/logging_consumer.hpp"
|
||||
|
||||
#include "events/events.hpp"
|
||||
#include "types/startup_exception.hpp"
|
||||
#include "utils/error_utils.hpp"
|
||||
#include "utils/file_utils.hpp"
|
||||
#include "utils/path_utils.hpp"
|
||||
#include "utils/unix/unix_utils.hpp"
|
||||
#include "utils/utils.hpp"
|
||||
|
||||
namespace repertory {
|
||||
logging_consumer::logging_consumer(const std::string &log_directory, const event_level &level)
|
||||
logging_consumer::logging_consumer(const std::string &log_directory,
|
||||
const event_level &level)
|
||||
: event_level_(level),
|
||||
log_directory_(utils::path::finalize(log_directory)),
|
||||
log_path_(utils::path::combine(log_directory, {"repertory.log"})) {
|
||||
utils::file::create_full_directory_path(log_directory_);
|
||||
if (not utils::file::create_full_directory_path(log_directory_)) {
|
||||
throw startup_exception("failed to create log directory|sp|" +
|
||||
log_directory_ + "|err|" +
|
||||
std::to_string(utils::get_last_error_code()));
|
||||
}
|
||||
|
||||
check_log_roll(0);
|
||||
reopen_log_file();
|
||||
E_SUBSCRIBE_ALL(process_event);
|
||||
E_SUBSCRIBE_EXACT(event_level_changed, [this](const event_level_changed &e) {
|
||||
event_level_ = event_level_from_string(e.get_new_event_level().get<std::string>());
|
||||
});
|
||||
logging_thread_ = std::make_unique<std::thread>([this]() { this->logging_thread(); });
|
||||
E_SUBSCRIBE_EXACT(event_level_changed,
|
||||
[this](const event_level_changed &evt) {
|
||||
event_level_ = event_level_from_string(
|
||||
evt.get_new_event_level().get<std::string>());
|
||||
});
|
||||
logging_thread_ =
|
||||
std::make_unique<std::thread>([this] { logging_thread(false); });
|
||||
}
|
||||
|
||||
logging_consumer::~logging_consumer() {
|
||||
E_CONSUMER_RELEASE();
|
||||
{
|
||||
mutex_lock l(log_mutex_);
|
||||
logging_active_ = false;
|
||||
log_notify_.notify_all();
|
||||
}
|
||||
|
||||
unique_mutex_lock l(log_mutex_);
|
||||
logging_active_ = false;
|
||||
log_notify_.notify_all();
|
||||
l.unlock();
|
||||
|
||||
logging_thread_->join();
|
||||
logging_thread_.reset();
|
||||
|
||||
logging_thread(true);
|
||||
close_log_file();
|
||||
}
|
||||
|
||||
void logging_consumer::check_log_roll(const size_t &count) {
|
||||
void logging_consumer::check_log_roll(std::size_t count) {
|
||||
std::uint64_t file_size{};
|
||||
const auto success = utils::file::get_file_size(log_path_, file_size);
|
||||
if (success && (file_size + count) >= MAX_LOG_FILE_SIZE) {
|
||||
close_log_file();
|
||||
for (std::uint8_t i = MAX_LOG_FILES; i > 0u; i--) {
|
||||
const auto temp_log_path = utils::path::combine(
|
||||
log_directory_, {"repertory." + utils::string::from_uint8(i) + ".log"});
|
||||
log_directory_, {"repertory." + std::to_string(i) + ".log"});
|
||||
if (utils::file::is_file(temp_log_path)) {
|
||||
if (i == MAX_LOG_FILES) {
|
||||
utils::file::delete_file(temp_log_path);
|
||||
if (not utils::file::retry_delete_file(temp_log_path)) {
|
||||
}
|
||||
} else {
|
||||
const auto next_file_path = utils::path::combine(
|
||||
log_directory_,
|
||||
{"repertory." + utils::string::from_uint8(i + std::uint8_t(1)) + ".log"});
|
||||
utils::file::move_file(temp_log_path, next_file_path);
|
||||
{"repertory." + std::to_string(i + std::uint8_t(1)) + ".log"});
|
||||
if (not utils::file::move_file(temp_log_path, next_file_path)) {
|
||||
utils::error::raise_error(__FUNCTION__,
|
||||
utils::get_last_error_code(),
|
||||
temp_log_path + "|dest|" + next_file_path,
|
||||
"failed to move file");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
utils::file::move_file(log_path_, utils::path::combine(log_directory_, {"repertory.1.log"}));
|
||||
|
||||
auto backup_log_path =
|
||||
utils::path::combine(log_directory_, {"repertory.1.log"});
|
||||
if (not utils::file::move_file(log_path_, backup_log_path)) {
|
||||
utils::error::raise_error(__FUNCTION__, utils::get_last_error_code(),
|
||||
log_path_ + "|dest|" + backup_log_path,
|
||||
"failed to move file");
|
||||
}
|
||||
reopen_log_file();
|
||||
}
|
||||
}
|
||||
@ -80,7 +112,7 @@ void logging_consumer::close_log_file() {
|
||||
}
|
||||
}
|
||||
|
||||
void logging_consumer::logging_thread(const bool &drain) {
|
||||
void logging_consumer::logging_thread(bool drain) {
|
||||
do {
|
||||
std::deque<std::shared_ptr<event>> events;
|
||||
{
|
||||
@ -112,7 +144,8 @@ void logging_consumer::logging_thread(const bool &drain) {
|
||||
check_log_roll(msg.length());
|
||||
auto retry = true;
|
||||
for (int i = 0; retry && (i < 2); i++) {
|
||||
retry = (not log_file_ || (fwrite(&msg[0], 1, msg.length(), log_file_) != msg.length()));
|
||||
retry = (not log_file_ || (fwrite(&msg[0], 1, msg.length(),
|
||||
log_file_) != msg.length()));
|
||||
if (retry) {
|
||||
reopen_log_file();
|
||||
}
|
||||
|
Reference in New Issue
Block a user