Merge branch 'master' into public-dashboard

# Conflicts:
#	server/server.js
This commit is contained in:
LouisLam 2021-09-20 18:48:44 +08:00
commit a8e170f6a8
23 changed files with 430 additions and 30 deletions

View file

@ -44,6 +44,16 @@ class Database {
static noReject = true;
static init(args) {
// Data Directory (must be end with "/")
Database.dataDir = process.env.DATA_DIR || args["data-dir"] || "./data/";
Database.path = Database.dataDir + "kuma.db";
if (! fs.existsSync(Database.dataDir)) {
fs.mkdirSync(Database.dataDir, { recursive: true });
}
console.log(`Data Dir: ${Database.dataDir}`);
}
static async connect() {
const acquireConnectionTimeout = 120 * 1000;