Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 06d9b65

Browse files
authored
Merge pull request #517 from foxhlchen/pr-empty-filename
`filename` should not be empty for TimeBasedRollingFileAppender
2 parents 7750e5e + 3754f77 commit 06d9b65

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/fileappender.cxx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,7 +1356,10 @@ void
13561356
TimeBasedRollingFileAppender::open(std::ios_base::openmode mode)
13571357
{
13581358
scheduledFilename = helpers::getFormattedTime(filenamePattern, helpers::now(), false);
1359-
tstring currentFilename = filename.empty() ? scheduledFilename : filename;
1359+
if (filename.empty())
1360+
filename = scheduledFilename;
1361+
1362+
tstring currentFilename = filename;
13601363

13611364
if (createDirs)
13621365
internal::make_dirs (currentFilename);
@@ -1401,7 +1404,7 @@ TimeBasedRollingFileAppender::rollover(bool alreadyLocked)
14011404
// should remain unchanged on a close
14021405
out.clear();
14031406

1404-
if (! filename.empty())
1407+
if (filename != scheduledFilename)
14051408
{
14061409
helpers::LogLog & loglog = helpers::getLogLog();
14071410
long ret;

0 commit comments

Comments
 (0)