actions
/
toolkit
mirror of https://github.com/actions/toolkit
1
0
Fork 0
Code

Fix broken line buffers (#773) 

* Fix broken line buffers

* Code style
pull/827/head
Andrey Savitsky 2021-06-02 23:29:46 +03:00 committed by GitHub
parent 439eaced07
commit c5035362ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/exec/src/toolrunner.ts
View File

@ -84,7 +84,7 @@ export class ToolRunner extends events.EventEmitter {
data: Buffer, data: Buffer,
strBuffer: string, strBuffer: string,
onLine: (line: string) => void onLine: (line: string) => void
): void { ): string {
try { try {
let s = strBuffer + data.toString() let s = strBuffer + data.toString()
let n = s.indexOf(os.EOL) let n = s.indexOf(os.EOL)
@ -98,10 +98,12 @@ export class ToolRunner extends events.EventEmitter {
n = s.indexOf(os.EOL) n = s.indexOf(os.EOL)
} }
strBuffer = s return s
} catch (err) { } catch (err) {
// streaming lines to console is best effort. Don't fail a build. // streaming lines to console is best effort. Don't fail a build.
this._debug(`error processing line. Failed with error ${err}`) this._debug(`error processing line. Failed with error ${err}`)
return ''
} }
} }
@ -444,7 +446,7 @@ export class ToolRunner extends events.EventEmitter {
this._getSpawnOptions(this.options, fileName) this._getSpawnOptions(this.options, fileName)
) )
const stdbuffer = '' let stdbuffer = ''
if (cp.stdout) { if (cp.stdout) {
cp.stdout.on('data', (data: Buffer) => { cp.stdout.on('data', (data: Buffer) => {
if (this.options.listeners && this.options.listeners.stdout) { if (this.options.listeners && this.options.listeners.stdout) {
@ -455,15 +457,19 @@ export class ToolRunner extends events.EventEmitter {
optionsNonNull.outStream.write(data) optionsNonNull.outStream.write(data)
} }
this._processLineBuffer(data, stdbuffer, (line: string) => { stdbuffer = this._processLineBuffer(
if (this.options.listeners && this.options.listeners.stdline) { data,
this.options.listeners.stdline(line) stdbuffer,
(line: string) => {
if (this.options.listeners && this.options.listeners.stdline) {
this.options.listeners.stdline(line)
}
} }
}) )
}) })
} }
const errbuffer = '' let errbuffer = ''
if (cp.stderr) { if (cp.stderr) {
cp.stderr.on('data', (data: Buffer) => { cp.stderr.on('data', (data: Buffer) => {
state.processStderr = true state.processStderr = true
@ -482,11 +488,15 @@ export class ToolRunner extends events.EventEmitter {
s.write(data) s.write(data)
} }
this._processLineBuffer(data, errbuffer, (line: string) => { errbuffer = this._processLineBuffer(
if (this.options.listeners && this.options.listeners.errline) { data,
this.options.listeners.errline(line) errbuffer,
(line: string) => {
if (this.options.listeners && this.options.listeners.errline) {
this.options.listeners.errline(line)
}
} }
}) )
}) })
} }