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

Merge pull request #1431 from tt4g/avoid-references-to-race-data-filename

Browse Source 
Avoid references to race data filename
This commit is contained in:
Gabi Melman
2020-02-12 12:09:25 +02:00
committed by GitHub
parent a343328a21 0cf1af5bbf
commit e8daf7c73b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -54,7 +54,7 @@ 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() SPDLOG_INLINE filename_t rotating_file_sink<Mutex>::filename()
{ {
std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_); 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(); filename_t filename();
protected: protected:
void sink_it_(const details::log_msg &msg) override; void sink_it_(const details::log_msg &msg) override;