mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 16:36:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

DB: Clean up database initialization

Browse source
This commit is contained in:
Richard Hansen 2022-04-19 17:48:44 -04:00
parent f22fb13d89
commit 10206d9e25
1 changed files with 19 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/node/db/DB.js
View file

@ -25,11 +25,8 @@ const ueberDB = require('ueberdb2');
const settings = require('../utils/Settings'); const settings = require('../utils/Settings');
const log4js = require('log4js'); const log4js = require('log4js');
const stats = require('../stats'); const stats = require('../stats');
const util = require('util');
// set database settings const logger = log4js.getLogger('ueberDB');
const db =
new ueberDB.Database(settings.dbType, settings.dbSettings, null, log4js.getLogger('ueberDB'));
/** /**
* The UeberDB Object that provides the database functions * The UeberDB Object that provides the database functions
@ -38,49 +35,26 @@ exports.db = null;
/** /**
* Initializes the database with the settings provided by the settings module * Initializes the database with the settings provided by the settings module
* @param {Function} callback
*/ */
exports.init = async () => await new Promise((resolve, reject) => { exports.init = async () => {
db.init((err) => { exports.db = new ueberDB.Database(settings.dbType, settings.dbSettings, null, logger);
if (err) { await exports.db.init();
// there was an error while initializing the database, output it and stop if (exports.db.metrics != null) {
console.error('ERROR: Problem while initalizing the database'); for (const [metric, value] of Object.entries(exports.db.metrics)) {
console.error(err.stack ? err.stack : err); if (typeof value !== 'number') continue;
process.exit(1); stats.gauge(`ueberdb_${metric}`, () => exports.db.metrics[metric]);
} }
}
if (db.metrics != null) { for (const fn of ['get', 'set', 'findKeys', 'getSub', 'setSub', 'remove']) {
for (const [metric, value] of Object.entries(db.metrics)) { const f = exports.db[fn];
if (typeof value !== 'number') continue; exports[fn] = async (...args) => await f.call(exports.db, ...args);
stats.gauge(`ueberdb_${metric}`, () => db.metrics[metric]); Object.setPrototypeOf(exports[fn], Object.getPrototypeOf(f));
} Object.defineProperties(exports[fn], Object.getOwnPropertyDescriptors(f));
} }
};
// everything ok, set up Promise-based methods
['get', 'set', 'findKeys', 'getSub', 'setSub', 'remove'].forEach((fn) => {
exports[fn] = util.promisify(db[fn].bind(db));
});
// set up wrappers for get and getSub that can't return "undefined"
const get = exports.get;
exports.get = async (key) => {
const result = await get(key);
return (result === undefined) ? null : result;
};
const getSub = exports.getSub;
exports.getSub = async (key, sub) => {
const result = await getSub(key, sub);
return (result === undefined) ? null : result;
};
// exposed for those callers that need the underlying raw API
exports.db = db;
resolve();
});
});
exports.shutdown = async (hookName, context) => { exports.shutdown = async (hookName, context) => {
await util.promisify(db.close.bind(db))(); if (exports.db != null) await exports.db.close();
console.log('Database closed'); exports.db = null;
logger.log('Database closed');
}; };