From 9aae057f324bee043e759ccb56ec02fe612e8b65 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sat, 27 Aug 2022 14:47:29 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?= =?UTF-8?q?=D0=B0=20lowMemoryMode=20=D0=BD=D0=B0=20=D1=81=D0=BB=D1=83?= =?UTF-8?q?=D1=87=D0=B0=D0=B9,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BF=D0=B0?= =?UTF-8?q?=D0=BC=D1=8F=D1=82=D0=B8=20=D0=BD=D0=B0=20=D0=BC=D0=B0=D1=88?= =?UTF-8?q?=D0=B8=D0=BD=D0=B5=202=D0=93=D0=B1=20=D0=B8=D0=BB=D0=B8=20?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8C=D1=88=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Search/Search.vue | 4 ++-- server/config/base.js | 1 + server/config/index.js | 3 ++- server/core/DbCreator.js | 11 +++++++---- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue index 524229f..14588e8 100644 --- a/client/components/Search/Search.vue +++ b/client/components/Search/Search.vue @@ -19,9 +19,9 @@
-
+
-
+
{{ projectName }}
diff --git a/server/config/base.js b/server/config/base.js index 1f37a5d..941e9f6 100644 --- a/server/config/base.js +++ b/server/config/base.js @@ -20,6 +20,7 @@ module.exports = { maxFilesDirSize: 1024*1024*1024,//1Gb queryCacheEnabled: true, cacheCleanInterval: 60,//minutes + lowMemoryMode: false, webConfigParams: ['name', 'version', 'branch'], diff --git a/server/config/index.js b/server/config/index.js index 38801e2..6fd950f 100644 --- a/server/config/index.js +++ b/server/config/index.js @@ -8,7 +8,8 @@ const propsToSave = [ 'maxFilesDirSize', 'queryCacheEnabled', 'cacheCleanInterval', - 'server', + 'lowMemoryMode', + 'server', ]; let instance = null; diff --git a/server/core/DbCreator.js b/server/core/DbCreator.js index 2e750a1..ec736c6 100644 --- a/server/core/DbCreator.js +++ b/server/core/DbCreator.js @@ -18,7 +18,7 @@ class DbCreator { //временная таблица await db.create({ table: 'book', - cacheSize: 5, + cacheSize: (config.lowMemoryMode ? 5 : 500), }); //поисковые таблицы, позже сохраним в БД @@ -121,7 +121,7 @@ class DbCreator { recsLoaded += chunk.length; callback({recsLoaded}); - if (chunkNum++ % 10 == 0) + if (chunkNum++ % 10 == 0 && config.lowMemoryMode) utils.freeMemory(); }; @@ -333,8 +333,10 @@ class DbCreator { break; await utils.sleep(100); - utils.freeMemory(); - await db.freeMemory(); + if (config.lowMemoryMode) { + utils.freeMemory(); + await db.freeMemory(); + } } //чистка памяти, ибо жрет как не в себя @@ -408,6 +410,7 @@ class DbCreator { nullArr(); await db.close({table}); utils.freeMemory(); + await db.freeMemory(); }; //author