github
/
dev-sidecar
mirror of https://github.com/docmirror/dev-sidecar
1
0
Fork 0
Code Issues Releases Wiki Activity

bugfix: 修复记录shell命令日志时，线程卡死的问题

pull/375/head
王良 2024-10-16 16:46:26 +08:00
parent fb9226cf69
commit 0859439f0a
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/core/src/shell/shell.js
View File

@ -80,7 +80,7 @@ function _childExec (composeCmds, options = {}) {
childProcess.exec(composeCmds, options, function (error, stdout, stderr) {
if (error) {
if (options.printErrorLog !== false) {
log.error('cmd 命令执行错误：\n===>\ncommands:', composeCmds, '\n error:', error, '\n stdout:', stdout, '\n stderr:', stderr, '\n<===')
log.error('cmd 命令执行错误：\n===>\ncommands:', composeCmds, '\n error:', error, '\n<===')
}
reject(new Error(stderr))
} else {
@ -105,7 +105,7 @@ function childExec (composeCmds, options = {}) {
// console.log('------', decoder.decode(stderr))
const message = iconv.decode(Buffer.from(stderr, binaryEncoding), encoding)
if (options.printErrorLog !== false) {
log.error('cmd 命令执行错误：\n------------------------------\ncommands:', composeCmds, '\n message:', message, '\n error:', error, '\n stdout:', stdout, '\n stderr:', stderr, '\n------------------------------')
log.error('cmd 命令执行错误：\n------------------------------\ncommands:', composeCmds, '\n message:', message, '\n error:', error, '\n------------------------------')
}
reject(new Error(message))
} else {
@ -154,15 +154,20 @@ async function execute (executor, args) {
async function execFile (file, args, options) {
return new Promise((resolve, reject) => {
_execFile(file, args, options, (err, stdout) => {
if (err) {
log.error('文件执行出错：', file, err)
reject(err)
return
}
log.debug('执行成功：', stdout)
resolve(stdout)
})
try {
_execFile(file, args, options, (err, stdout) => {
if (err) {
log.error('文件执行出错：', file, err)
reject(err)
return
}
log.debug('文件执行成功：', file)
resolve(stdout)
})
} catch (e) {
log.error('文件执行出错：', file, e)
reject(e)
}
})
}