From 185fb57b8c93c41162d9c8c7e29acd46f22febf8 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 21 Jan 2020 16:25:30 +0700 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=BD=D0=B5=D1=80=D0=B0=D0=B1=D0=BE=D1=87=D0=B8=D0=B9=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/controllers/WorkerController.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/controllers/WorkerController.js b/server/controllers/WorkerController.js index 86554ab4..00742c0e 100644 --- a/server/controllers/WorkerController.js +++ b/server/controllers/WorkerController.js @@ -47,10 +47,6 @@ class WorkerController extends BaseController { state = this.workerState.getState(request.workerId); if (!state) break; - if (i == 0) { - state = Object.assign({dummy: '0'.repeat(1024)}, state); - } - res.write(splitter + JSON.stringify(state)); res.flush(); From 67feee9aa1c1b1a73b5efd62fd210d253c4f3fec Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 21 Jan 2020 16:53:34 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/Reader/ReaderWorker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/core/Reader/ReaderWorker.js b/server/core/Reader/ReaderWorker.js index ef24a707..91fc911b 100644 --- a/server/core/Reader/ReaderWorker.js +++ b/server/core/Reader/ReaderWorker.js @@ -212,7 +212,7 @@ class ReaderWorker { while (i < files.length && size > maxSize) { const file = files[i]; const oldFile = `${dir}/${file.name}`; - if (this.remoteWebDavStorage) { + if (this.remoteWebDavStorage && dir === this.config.tempPublicDir) { try { //log(`remoteWebDavStorage.putFile ${path.basename(oldFile)}`); await this.remoteWebDavStorage.putFile(oldFile); From 15b0f05a059e784d1c5176117fa4174537126c2e Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 21 Jan 2020 16:55:41 +0700 Subject: [PATCH 3/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/Reader/ReaderWorker.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/core/Reader/ReaderWorker.js b/server/core/Reader/ReaderWorker.js index 91fc911b..ab407406 100644 --- a/server/core/Reader/ReaderWorker.js +++ b/server/core/Reader/ReaderWorker.js @@ -212,6 +212,9 @@ class ReaderWorker { while (i < files.length && size > maxSize) { const file = files[i]; const oldFile = `${dir}/${file.name}`; + + //отправляем только this.config.tempPublicDir + //TODO: убрать в будущем, т.к. уже делается ленивое сохранение compFilename в удаленном хранилище if (this.remoteWebDavStorage && dir === this.config.tempPublicDir) { try { //log(`remoteWebDavStorage.putFile ${path.basename(oldFile)}`);