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

start using "thenify" to support callback and promises

Browse source 
PadManager.sanitizePadId() can't use thenify: single arg callback
This commit is contained in:
Ray Bellis 2019-01-21 16:28:05 +00:00
parent 40c45077ef
commit 17fe32ec0c
9 changed files with 170 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@
var ueberDB = require("ueberdb2");
var settings = require("../utils/Settings");
var log4js = require('log4js');
const thenify = require("thenify").withCallback;
// set database settings
var db = new ueberDB.database(settings.dbType, settings.dbSettings, null, log4js.getLogger("ueberDB"));
@ -35,7 +36,7 @@ exports.db = null;
* Initalizes the database with the settings provided by the settings module
* @param {Function} callback
*/
function init(callback) {
exports.init = thenify(function (callback) {
// initalize the database async
db.init(function(err) {
if (err) {
@ -49,20 +50,4 @@ function init(callback) {
callback(null);
}
});
}
/**
* Initalizes the database with the settings provided by the settings module
* If the callback is not supplied a Promise is returned instead.
* @param {Function} callback
*/
exports.init = function(callback)
{
if (callback === undefined) {
return new Promise(resolve => init(resolve));
} else if (typeof callback === "function") {
init(callback);
} else {
throw new TypeError("DB.init callback parameter");
}
}
});