diff --git a/server/controllers/WebSocketController.js b/server/controllers/WebSocketController.js index b744b035..0e9f5f25 100644 --- a/server/controllers/WebSocketController.js +++ b/server/controllers/WebSocketController.js @@ -138,6 +138,7 @@ class WebSocketController { i++; if (i > 2*60*1000/refreshPause) {//2 мин ждем телодвижений воркера this.send({state: 'error', error: 'Время ожидания процесса истекло'}, req, ws); + break; } i = (prevProgress != state.progress || prevState != state.state ? 1 : i); } diff --git a/server/core/Reader/ReaderWorker.js b/server/core/Reader/ReaderWorker.js index 4aa1606d..223f1307 100644 --- a/server/core/Reader/ReaderWorker.js +++ b/server/core/Reader/ReaderWorker.js @@ -12,7 +12,7 @@ const utils = require('../utils'); const log = new (require('../AppLogger'))().log;//singleton const cleanDirPeriod = 60*60*1000;//1 раз в час -const queue = new LimitedQueue(5, 100, 5*60*1000);//5 минут ожидание подвижек +const queue = new LimitedQueue(5, 100, 4*60*1000);//4 минуты ожидание подвижек let instance = null;