franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6219 from lioncash/log-erase 

log/backend: Make use of erase_if
This commit is contained in:
bunnei 2021-04-20 16:07:00 -07:00 committed by GitHub
parent 8cdd86fa25 6125590a7b
commit 4cd6c3e6f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/logging/backend.cpp
View File

@ -56,10 +56,10 @@ public:
void RemoveBackend(std::string_view backend_name) { void RemoveBackend(std::string_view backend_name) {
std::lock_guard lock{writing_mutex}; std::lock_guard lock{writing_mutex};
const auto it =
std::remove_if(backends.begin(), backends.end(), std::erase_if(backends, [&backend_name](const auto& backend) {
[&backend_name](const auto& i) { return backend_name == i->GetName(); }); return backend_name == backend->GetName();
backends.erase(it, backends.end()); });
} }
const Filter& GetGlobalFilter() const { const Filter& GetGlobalFilter() const {
@ -148,12 +148,14 @@ void ColorConsoleBackend::Write(const Entry& entry) {
PrintColoredMessage(entry); PrintColoredMessage(entry);
} }
FileBackend::FileBackend(const std::string& filename) : bytes_written(0) { FileBackend::FileBackend(const std::string& filename) {
if (FS::Exists(filename + ".old.txt")) { const auto old_filename = filename + ".old.txt";
FS::Delete(filename + ".old.txt");
if (FS::Exists(old_filename)) {
FS::Delete(old_filename);
} }
if (FS::Exists(filename)) { if (FS::Exists(filename)) {
FS::Rename(filename, filename + ".old.txt"); FS::Rename(filename, old_filename);
} }
// _SH_DENYWR allows read only access to the file for other programs. // _SH_DENYWR allows read only access to the file for other programs.

4
src/common/logging/backend.h
View File

@ -94,8 +94,8 @@ public:
void Write(const Entry& entry) override; void Write(const Entry& entry) override;
private: private:
Common::FS::IOFile file; FS::IOFile file;
std::size_t bytes_written; std::size_t bytes_written = 0;
}; };
/** /**