From 15d01ad7fcd26bd631d024045104a02f50de9c37 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sat, 5 Dec 2020 13:41:42 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=86?= =?UTF-8?q?=D0=B8=D1=8F=20=D1=82=D0=B0=D0=B9=D0=BC=D0=B0=D1=83=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=BE=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D0=B8=20=D0=BE?= =?UTF-8?q?=D0=B6=D0=B8=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/api/reader.js | 2 +- server/controllers/WebSocketController.js | 2 +- server/core/Reader/BookConverter/ConvertBase.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/api/reader.js b/client/api/reader.js index e987fe80..316787fe 100644 --- a/client/api/reader.js +++ b/client/api/reader.js @@ -66,7 +66,7 @@ class Reader { await utils.sleep(refreshPause); i++; - if (i > 120*1000/refreshPause) {//2 мин ждем телодвижений воркера + if (i > 180*1000/refreshPause) {//3 мин ждем телодвижений воркера throw new Error('Слишком долгое время ожидания'); } //проверка воркера diff --git a/server/controllers/WebSocketController.js b/server/controllers/WebSocketController.js index 0e9f5f25..ea59241f 100644 --- a/server/controllers/WebSocketController.js +++ b/server/controllers/WebSocketController.js @@ -136,7 +136,7 @@ class WebSocketController { break; i++; - if (i > 2*60*1000/refreshPause) {//2 мин ждем телодвижений воркера + if (i > 3*60*1000/refreshPause) {//3 мин ждем телодвижений воркера this.send({state: 'error', error: 'Время ожидания процесса истекло'}, req, ws); break; } diff --git a/server/core/Reader/BookConverter/ConvertBase.js b/server/core/Reader/BookConverter/ConvertBase.js index 1a70f536..6d8304f0 100644 --- a/server/core/Reader/BookConverter/ConvertBase.js +++ b/server/core/Reader/BookConverter/ConvertBase.js @@ -6,7 +6,7 @@ const LimitedQueue = require('../../LimitedQueue'); const textUtils = require('./textUtils'); const utils = require('../../utils'); -const queue = new LimitedQueue(3, 20, 3*60*1000);//3 минуты ожидание подвижек +const queue = new LimitedQueue(3, 20, 2*60*1000);//2 минуты ожидание подвижек class ConvertBase { constructor(config) {