-
Notifications
You must be signed in to change notification settings - Fork 286
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(core-manager): handle stream errors on log generatiton (#4303)
- Loading branch information
1 parent
4570d9f
commit 25d0943
Showing
5 changed files
with
214 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,31 @@ | ||
import { createWriteStream, ensureDirSync, renameSync } from "fs-extra"; | ||
import { dirname } from "path"; | ||
import { Writable, Readable } from "stream"; | ||
import { pipeline, Readable } from "stream"; | ||
import zlib from "zlib"; | ||
|
||
import { GenerateLog } from "./generate-log"; | ||
import { LogTransformStream } from "./log-transform-stream"; | ||
|
||
export class GenerateLogGz extends GenerateLog { | ||
public async execute(): Promise<void> { | ||
const readStream = Readable.from(this.database.getAllIterator("logs", this.options.query), { objectMode: true }); | ||
const writeStream = this.prepareOutputStream(); | ||
await new Promise((resolve, reject) => { | ||
const writeStream = this.prepareOutputStream(); | ||
|
||
readStream.pipe(new LogTransformStream()).pipe(writeStream); | ||
await this.resolveOnClose(writeStream); | ||
pipeline( | ||
Readable.from(this.database.getAllIterator("logs", this.options.query), { objectMode: true }), | ||
new LogTransformStream(), | ||
zlib.createGzip(), | ||
writeStream, | ||
(err) => { | ||
if (err) { | ||
writeStream.destroy(); | ||
this.removeTempFiles(); | ||
|
||
ensureDirSync(dirname(this.getFilePath())); | ||
renameSync(this.getTempFilePath(), this.getFilePath()); | ||
} | ||
|
||
private prepareOutputStream(): Writable { | ||
ensureDirSync(dirname(this.getTempFilePath())); | ||
|
||
const stream = zlib.createGzip(); | ||
stream.pipe(createWriteStream(this.getTempFilePath())); | ||
|
||
return stream; | ||
reject(err); | ||
} else { | ||
this.moveArchive(); | ||
resolve(); | ||
} | ||
}, | ||
); | ||
}); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,39 +1,57 @@ | ||
import archiver from "archiver"; | ||
import { createWriteStream, ensureDirSync, renameSync } from "fs-extra"; | ||
import { dirname, parse } from "path"; | ||
import { Writable, Readable } from "stream"; | ||
import { parse } from "path"; | ||
import { pipeline, Readable } from "stream"; | ||
|
||
import { GenerateLog } from "./generate-log"; | ||
import { LogTransformStream } from "./log-transform-stream"; | ||
|
||
export class GenerateLogZip extends GenerateLog { | ||
public async execute(): Promise<void> { | ||
const readStream = Readable.from(this.database.getAllIterator("logs", this.options.query), {objectMode: true}); | ||
const writeStream = this.prepareOutputStream(); | ||
await new Promise(async (resolve, reject) => { | ||
const writeStream = this.prepareOutputStream(); | ||
|
||
const archive = archiver("zip", { | ||
zlib: { level: 9 }, | ||
}); | ||
archive.pipe(writeStream); | ||
writeStream.on("close", () => { | ||
resolve(); | ||
}); | ||
|
||
archive.append( | ||
readStream.pipe( | ||
new LogTransformStream(), | ||
), | ||
{ name: parse(this.options.logFileName).name + ".log" }, | ||
); | ||
const archive = archiver("zip", { | ||
zlib: { level: 9 }, | ||
}); | ||
|
||
archive.finalize(); | ||
const handleError = (err) => { | ||
writeStream.removeAllListeners("close"); | ||
|
||
await this.resolveOnClose(writeStream); | ||
archive.abort(); | ||
writeStream.destroy(); | ||
this.removeTempFiles(); | ||
|
||
ensureDirSync(dirname(this.getFilePath())); | ||
renameSync(this.getTempFilePath(), this.getFilePath()); | ||
} | ||
reject(err); | ||
}; | ||
|
||
private prepareOutputStream(): Writable { | ||
ensureDirSync(dirname(this.getTempFilePath())); | ||
archive.on("error", (err) => { | ||
handleError(err); | ||
}); | ||
|
||
const readStream = pipeline( | ||
Readable.from(this.database.getAllIterator("logs", this.options.query), { | ||
objectMode: true, | ||
}), | ||
new LogTransformStream(), | ||
(err) => { | ||
if (err) { | ||
handleError(err); | ||
} | ||
}, | ||
); | ||
|
||
archive.pipe(writeStream); | ||
archive.append(readStream, { | ||
name: parse(this.options.logFileName).name + ".log", | ||
}); | ||
|
||
archive.finalize(); | ||
}); | ||
|
||
return createWriteStream(this.getTempFilePath()); | ||
this.moveArchive(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters