gitMirror/spdlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1430 from tt4g/add-critical-section-to-filename-api

Browse Source 
Add critical section to filename function of  each file sink
This commit is contained in:
Gabi Melman
2020-02-12 07:35:52 +02:00
committed by GitHub
parent 574563d711 0778211116
commit 5c410f4ca2
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/spdlog/sinks/daily_file_sink.h
View File

@@ -70,8 +70,9 @@ public:
} }
} }
const filename_t &filename() const const filename_t &filename()
{ {
std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
return file_helper_.filename(); return file_helper_.filename();
} }

3
include/spdlog/sinks/rotating_file_sink-inl.h
View File

@@ -54,8 +54,9 @@ SPDLOG_INLINE filename_t rotating_file_sink<Mutex>::calc_filename(const filename
} }
template<typename Mutex> template<typename Mutex>
SPDLOG_INLINE const filename_t &rotating_file_sink<Mutex>::filename() const SPDLOG_INLINE const filename_t &rotating_file_sink<Mutex>::filename()
{ {
std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
return file_helper_.filename(); return file_helper_.filename();
} }

2
include/spdlog/sinks/rotating_file_sink.h
View File

@@ -24,7 +24,7 @@ class rotating_file_sink final : public base_sink<Mutex>
public: public:
rotating_file_sink(filename_t base_filename, std::size_t max_size, std::size_t max_files, bool rotate_on_open = false); rotating_file_sink(filename_t base_filename, std::size_t max_size, std::size_t max_files, bool rotate_on_open = false);
static filename_t calc_filename(const filename_t &filename, std::size_t index); static filename_t calc_filename(const filename_t &filename, std::size_t index);
const filename_t &filename() const; const filename_t &filename();
protected: protected:
void sink_it_(const details::log_msg &msg) override; void sink_it_(const details::log_msg &msg) override;