diff --git a/server/config/base.js b/server/config/base.js index d4c7e96c..0ec65f87 100644 --- a/server/config/base.js +++ b/server/config/base.js @@ -17,6 +17,10 @@ module.exports = { dbFileName: 'db.sqlite', loggingEnabled: true, + maxUploadFileSize: 50*1024*1024,//50Мб + maxTempPublicDirSize: 512*1024*1024,//512Мб + maxUploadPublicDirSize: 200*1024*1024,//100Мб + servers: [ { serverName: '1', diff --git a/server/core/ReaderWorker.js b/server/core/ReaderWorker.js index 7c9d5783..a087da8c 100644 --- a/server/core/ReaderWorker.js +++ b/server/core/ReaderWorker.js @@ -8,8 +8,6 @@ const FileDecompressor = require('./FileDecompressor'); const BookConverter = require('./BookConverter'); const utils = require('./utils'); -const maxTempPublicDirSize = 512*1024*1024;//512Мб -const maxUploadDirSize = 200*1024*1024;//100Мб let singleCleanExecute = false; class ReaderWorker { @@ -27,8 +25,8 @@ class ReaderWorker { this.bookConverter = new BookConverter(); if (!singleCleanExecute) { - this.periodicCleanDir(this.config.tempPublicDir, maxTempPublicDirSize, 60*60*1000);//1 раз в час - this.periodicCleanDir(this.config.uploadDir, maxUploadDirSize, 60*60*1000);//1 раз в час + this.periodicCleanDir(this.config.tempPublicDir, this.config.maxTempPublicDirSize, 60*60*1000);//1 раз в час + this.periodicCleanDir(this.config.uploadDir, this.config.maxUploadPublicDirSize, 60*60*1000);//1 раз в час singleCleanExecute = true; } } diff --git a/server/routes.js b/server/routes.js index aa6014c0..0b57da60 100644 --- a/server/routes.js +++ b/server/routes.js @@ -2,8 +2,6 @@ const c = require('./controllers'); const utils = require('./core/utils'); const multer = require('multer'); -const maxUploadSize = 50*1024*1024; - function initRoutes(app, connPool, config) { const misc = new c.MiscController(connPool, config); const reader = new c.ReaderController(connPool, config); @@ -22,7 +20,7 @@ function initRoutes(app, connPool, config) { cb(null, utils.randomHexString(30)); } }); - const upload = multer({ storage, limits: {fileSize: maxUploadSize} }); + const upload = multer({ storage, limits: {fileSize: config.maxUploadFileSize} }); //routes const routes = [