From 9ec74eccb4c8d101f9c69017916c24f2196b03cf Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Fri, 3 Dec 2021 14:21:50 +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=20=D0=BF=D0=B0=D0=BF=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20for?= =?UTF-8?q?ceAutoRepair?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/db/JembaConnManager.js | 4 ++-- server/index.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/db/JembaConnManager.js b/server/db/JembaConnManager.js index 5b32142a..d3a2dd57 100644 --- a/server/db/JembaConnManager.js +++ b/server/db/JembaConnManager.js @@ -21,7 +21,7 @@ class JembaConnManager { return instance; } - async init(config, migs = jembaMigrations, undoLastMigration = false) { + async init(config, forceAutoRepair = false, migs = jembaMigrations, undoLastMigration = false) { if (this.inited) throw new Error('JembaConnManager initialized already'); @@ -52,7 +52,7 @@ class JembaConnManager { try { await dbConn.openAll(); } catch(e) { - if (dbConfig.autoRepair && + if ((forceAutoRepair || dbConfig.autoRepair) && ( e.message.indexOf('corrupted') >= 0 || e.message.indexOf('Unexpected token') >= 0 diff --git a/server/index.js b/server/index.js index 72577c11..884c147f 100644 --- a/server/index.js +++ b/server/index.js @@ -48,7 +48,7 @@ async function init() { await connManager.init(config); const jembaConnManager = new (require('./db/JembaConnManager'))();//singleton - await jembaConnManager.init(config); + await jembaConnManager.init(config, argv['auto-repair']); //converter SQLITE => JembaDb const converter = new (require('./db/Converter'))();