Skip to content

fix: last time's newest log file is not archived #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: last time's newest log file is not archived #335

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 29 additions & 14 deletions daily-rotate-file.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,24 @@ var DailyRotateFile = function (options) {
return !/["<>|\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f]/g.test(dirname);
}

function archive(oldFile) {
var oldFileExist = fs.existsSync(oldFile);
var gzExist = fs.existsSync(oldFile + '.gz');
if (!oldFileExist || gzExist) {
return;
}

var gzip = zlib.createGzip();
var inp = fs.createReadStream(oldFile);
var out = fs.createWriteStream(oldFile + '.gz');
inp.pipe(gzip).pipe(out).on('finish', function () {
if (fs.existsSync(oldFile)) {
fs.unlinkSync(oldFile);
}
self.emit('archive', oldFile + '.gz');
});
}

this.options = Object.assign({}, loggerDefaults, options);

if (options.stream) {
Expand Down Expand Up @@ -124,22 +142,19 @@ var DailyRotateFile = function (options) {
});

if (options.zippedArchive) {
this.logStream.on('rotate', function (oldFile) {
var oldFileExist = fs.existsSync(oldFile);
var gzExist = fs.existsSync(oldFile + '.gz');
if (!oldFileExist || gzExist) {
return;
this.logStream.on('new', function () {
if (self.logStream.auditLog
&& self.logStream.auditLog.files
&& self.logStream.auditLog.files.length > 1
&& self.logStream.auditLog.files[self.logStream.auditLog.files.length - 2]
) {
var lastOldFileAfterRestart = self.logStream.auditLog.files[self.logStream.auditLog.files.length - 2].name;
archive(lastOldFileAfterRestart);
}
});

var gzip = zlib.createGzip();
var inp = fs.createReadStream(oldFile);
var out = fs.createWriteStream(oldFile + '.gz');
inp.pipe(gzip).pipe(out).on('finish', function () {
if (fs.existsSync(oldFile)) {
fs.unlinkSync(oldFile);
}
self.emit('archive', oldFile + '.gz');
});
this.logStream.on('rotate', function (oldFile) {
archive(oldFile);
});
}

Expand Down