deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Поправка для журналирования ошибок конвертера

Browse Source
This commit is contained in:
Book Pauk
2020-11-23 21:19:04 +07:00
parent 20ac8a444b
commit 07c38d9a9f
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/Reader/BookConverter/ConvertBase.js
View File

@@ -53,9 +53,7 @@ class ConvertBase {
abort abort
}); });
if (result.code != 0) { if (result.code != 0) {
let error = result.code; const error = `${result.code}|FORLOG|, exec: ${path}, args: ${args.join(' ')}, stdout: ${result.stdout}, stderr: ${result.stderr}`;
if (this.config.branch == 'development')
error = `exec: ${path}, stdout: ${result.stdout}, stderr: ${result.stderr}`;
throw new Error(`Внешний конвертер завершился с ошибкой: ${error}`); throw new Error(`Внешний конвертер завершился с ошибкой: ${error}`);
} }
} catch(e) { } catch(e) {

11
server/core/Reader/ReaderWorker.js
View File

@@ -171,10 +171,15 @@ class ReaderWorker {
} catch (e) { } catch (e) {
log(LM_ERR, e.stack); 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}`); log(LM_ERR, `downloadedFilename: ${downloadedFilename}`);
if (e.message == 'abort')
e.message = overLoadMes; mes = mes[0];
wState.set({state: 'error', error: e.message}); if (mes == 'abort')
mes = overLoadMes;
wState.set({state: 'error', error: mes});
} finally { } finally {
//clean //clean
if (q) if (q)