From 5e07fdc75091072861b6556765d1a265b5d5e716 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 26 Dec 2018 22:08:55 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/Logger.js | 4 ++-- server/core/SqliteConnectionPool.js | 7 ++++--- server/core/utils.js | 1 - server/index.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/core/Logger.js b/server/core/Logger.js index 8c74e2d0..a7bbcfb6 100644 --- a/server/core/Logger.js +++ b/server/core/Logger.js @@ -153,11 +153,11 @@ class FileLog extends BaseLog { }, LOG_ROTATE_FILE_CHECK_INTERVAL); }; - await fs.writeAsync(this.fd, new Buffer(data.join(''))); + await fs.writeAsync(this.fd, Buffer.from(data.join(''))); } flushImplSync(data) { - fs.writeSync(this.fd, new Buffer(data.join(''))); + fs.writeSync(this.fd, Buffer.from(data.join(''))); } } diff --git a/server/core/SqliteConnectionPool.js b/server/core/SqliteConnectionPool.js index b3d64d0f..11452cea 100644 --- a/server/core/SqliteConnectionPool.js +++ b/server/core/SqliteConnectionPool.js @@ -6,15 +6,16 @@ const waitingDelay = 100; //ms class SqliteConnectionPool { constructor(connCount, logger, config) { - this.config = config; this.connCount = connCount; + this.logger = logger; + this.config = config; } async init() { this.logger.log('Opening database'); - utils.mkDirIfNotExistsSync(config.dataDir); - const dbFileName = config.dataDir + '/' + config.dbFileName; + utils.mkDirIfNotExistsSync(this.config.dataDir); + const dbFileName = this.config.dataDir + '/' + this.config.dbFileName; this.connections = []; this.taken = new Set(); diff --git a/server/core/utils.js b/server/core/utils.js index 38f793b6..9b20c53b 100644 --- a/server/core/utils.js +++ b/server/core/utils.js @@ -13,7 +13,6 @@ function statPathSync(path) { } function mkDirIfNotExistsSync(path) { - console.log(path); let exists = statPathSync(path); if (!exists) { fs.mkdirSync(path, {recursive: true, mode: 0o755}); diff --git a/server/index.js b/server/index.js index f792eb1f..4927dcfa 100644 --- a/server/index.js +++ b/server/index.js @@ -10,8 +10,8 @@ async function main() { const connPool = new SqliteConnectionPool(20, logger, config); await connPool.init(); - app.use(app.json()); - app.static('public'); + app.use(express.json()); + express.static('public'); require('./routes')(app, connPool, logger, config);