diff --git a/server/core/Reader/BookConverter/ConvertBase.js b/server/core/Reader/BookConverter/ConvertBase.js index 34aafe67..6ba20853 100644 --- a/server/core/Reader/BookConverter/ConvertBase.js +++ b/server/core/Reader/BookConverter/ConvertBase.js @@ -53,9 +53,7 @@ class ConvertBase { abort }); if (result.code != 0) { - let error = result.code; - if (this.config.branch == 'development') - error = `exec: ${path}, stdout: ${result.stdout}, stderr: ${result.stderr}`; + const error = `${result.code}|FORLOG|, exec: ${path}, args: ${args.join(' ')}, stdout: ${result.stdout}, stderr: ${result.stderr}`; throw new Error(`Внешний конвертер завершился с ошибкой: ${error}`); } } catch(e) { diff --git a/server/core/Reader/ReaderWorker.js b/server/core/Reader/ReaderWorker.js index 76ca0bfe..f0a30812 100644 --- a/server/core/Reader/ReaderWorker.js +++ b/server/core/Reader/ReaderWorker.js @@ -171,10 +171,15 @@ class ReaderWorker { } catch (e) { log(LM_ERR, e.stack); + let mes = e.message.split('|FORLOG|'); + if (mes[1]) + log(LM_ERR, mes[0] + mes[1]); log(LM_ERR, `downloadedFilename: ${downloadedFilename}`); - if (e.message == 'abort') - e.message = overLoadMes; - wState.set({state: 'error', error: e.message}); + + mes = mes[0]; + if (mes == 'abort') + mes = overLoadMes; + wState.set({state: 'error', error: mes}); } finally { //clean if (q)