github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-27 16:30:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #163 from overleaf/bg-use-encoding-on-process-output

Browse source 
set encoding when reading from streams
This commit is contained in:
Henry Oswald 2020-05-19 10:26:26 +01:00 committed by GitHub
commit e9c6f3b074
6 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/clsi/app/js/CompileManager.js
View file

@ -334,7 +334,7 @@ module.exports = CompileManager = {
proc.on('error', callback)
let stderr = ''
proc.stderr.on('data', chunk => (stderr += chunk.toString()))
proc.stderr.setEncoding('utf8').on('data', chunk => (stderr += chunk))
return proc.on('close', function(code) {
if (code === 0) {

2
services/clsi/app/js/LocalCommandRunner.js
View file

@ -46,7 +46,7 @@ module.exports = CommandRunner = {
const proc = spawn(command[0], command.slice(1), { cwd: directory, env })
let stdout = ''
proc.stdout.on('data', data => (stdout += data))
proc.stdout.setEncoding('utf8').on('data', data => (stdout += data))
proc.on('error', function(err) {
logger.err(

2
services/clsi/app/js/OutputFileFinder.js
View file

@ -87,7 +87,7 @@ module.exports = OutputFileFinder = {
const proc = spawn('find', args)
let stdout = ''
proc.stdout.on('data', chunk => (stdout += chunk.toString()))
proc.stdout.setEncoding('utf8').on('data', chunk => (stdout += chunk))
proc.on('error', callback)
return proc.on('close', function(code) {
if (code !== 0) {

2
services/clsi/app/js/OutputFileOptimiser.js
View file

@ -78,7 +78,7 @@ module.exports = OutputFileOptimiser = {
const timer = new Metrics.Timer('qpdf')
const proc = spawn('qpdf', args)
let stdout = ''
proc.stdout.on('data', chunk => (stdout += chunk.toString()))
proc.stdout.setEncoding('utf8').on('data', chunk => (stdout += chunk))
callback = _.once(callback) // avoid double call back for error and close event
proc.on('error', function(err) {
logger.warn({ err, args }, 'qpdf failed')

2
services/clsi/test/unit/js/CompileManagerTests.js
View file

@ -294,6 +294,7 @@ describe('CompileManager', function() {
this.proc = new EventEmitter()
this.proc.stdout = new EventEmitter()
this.proc.stderr = new EventEmitter()
this.proc.stderr.setEncoding = sinon.stub().returns(this.proc.stderr)
this.child_process.spawn = sinon.stub().returns(this.proc)
this.CompileManager.clearProject(
this.project_id,
@ -328,6 +329,7 @@ describe('CompileManager', function() {
this.proc = new EventEmitter()
this.proc.stdout = new EventEmitter()
this.proc.stderr = new EventEmitter()
this.proc.stderr.setEncoding = sinon.stub().returns(this.proc.stderr)
this.child_process.spawn = sinon.stub().returns(this.proc)
this.CompileManager.clearProject(
this.project_id,

1
services/clsi/test/unit/js/OutputFileFinderTests.js
View file

@ -70,6 +70,7 @@ describe('OutputFileFinder', function() {
beforeEach(function() {
this.proc = new EventEmitter()
this.proc.stdout = new EventEmitter()
this.proc.stdout.setEncoding = sinon.stub().returns(this.proc.stdout)
this.spawn.returns(this.proc)
this.directory = '/base/dir'
return this.OutputFileFinder._getAllFiles(this.directory, this.callback)